From 164d61b0a0c7293a273543d18f7bc5d3001f76b1 Mon Sep 17 00:00:00 2001 From: colinsl <44621864+colinsl@users.noreply.github.com> Date: Fri, 16 Jun 2023 10:28:58 -0700 Subject: [PATCH 1/5] [INTPROD-1125] Fix requirements incompatibility --- requirements3.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements3.txt b/requirements3.txt index 5cbf794..c2c5853 100644 --- a/requirements3.txt +++ b/requirements3.txt @@ -46,7 +46,6 @@ slackclient==1.0.7 # via -r requirements.in statsd==3.2.1 # via -r requirements.in toml==0.10.2 # via pytest typing-extensions==3.10.0.0 # via importlib-metadata -urllib3==1.26.5 # via requests websocket-client==0.56.0 # via slackclient werkzeug==0.15.5 # via flask zipp==3.4.1 # via importlib-metadata From adebc1ec8cb2051df2e21548e5cd3f7ec661b05b Mon Sep 17 00:00:00 2001 From: colinsl <44621864+colinsl@users.noreply.github.com> Date: Fri, 16 Jun 2023 10:51:59 -0700 Subject: [PATCH 2/5] Update push.yml --- .github/workflows/push.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2f77013..e8294ad 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,5 +1,8 @@ name: Build and Deploy on: + pull_request: + branches: + - master push: branches: - master From 047fa9ab4ecbe05dd86bc36cd712740cca97587f Mon Sep 17 00:00:00 2001 From: colinsl <44621864+colinsl@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:19:45 -0700 Subject: [PATCH 3/5] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e8294ad..b881111 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -59,7 +59,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@2.8 + uses: elgohr/Publish-Docker-Github-Action@5 with: name: lyft/omnibot username: ${{ secrets.DOCKER_USERNAME }} From a6a5850c4dce118c76c5f6aa4f8c737f5278bde4 Mon Sep 17 00:00:00 2001 From: colinsl <44621864+colinsl@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:20:26 -0700 Subject: [PATCH 4/5] Update requirements.txt --- docs/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 20d0697..02977b7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -5,7 +5,6 @@ MarkupSafe==1.1.1 Pygments==2.7.4 alabaster==0.7.10 babel==2.9.1 -gitdb==0.6.4 imagesize==0.7.1 pytz==2017.2 smmap==0.9.0 From 97f7e8881efead9c6f60899d4d26734b946dbf81 Mon Sep 17 00:00:00 2001 From: colinsl <44621864+colinsl@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:22:14 -0700 Subject: [PATCH 5/5] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b881111..bc996c5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -59,7 +59,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@5 + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: lyft/omnibot username: ${{ secrets.DOCKER_USERNAME }}