From a0133c900566feb0e4e30333a8608f972602965c Mon Sep 17 00:00:00 2001 From: Tanya <62726866+TanyaStere42@users.noreply.github.com> Date: Wed, 10 Jan 2024 16:32:25 -0800 Subject: [PATCH 01/14] remove slack build notifications Wild Me no longer leverages the slack integration for the build notifications, so removing the workflow noise --- .github/workflows/docker-publish.yaml | 34 --------------------------- 1 file changed, 34 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 59a700ab9..60ef59fb1 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -100,37 +100,3 @@ jobs: if: github.event_name == 'schedule' run: | ./scripts/utils/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/houston - - # Notify status in Slack - - name: Slack Notification - if: ${{ failure() && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Tagged / Latest Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - - - name: Slack Notification - if: ${{ failure() && github.ref == 'refs/heads/main' }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Bleeding Edge Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - - - name: Slack Notification - if: ${{ failure() && github.event_name == 'schedule' }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Nightly Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} From cd53a6dcbe7b89b8dcc47aaf0ec09e02012f5269 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Fri, 19 Jan 2024 16:40:36 -0700 Subject: [PATCH 02/14] change when event triggers --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 59a700ab9..f3060bfdb 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -27,7 +27,7 @@ jobs: ref: main - uses: actions/checkout@v2 - if: github.event_name != 'schedule' + if: github.event_name == 'release' with: submodules: true From 3663a68bcab84a5816b04c25ce48983bb7c334e9 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Fri, 19 Jan 2024 16:58:45 -0700 Subject: [PATCH 03/14] action of any other conditions --- .github/workflows/docker-publish.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index f3060bfdb..06b5bbdd8 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -134,3 +134,7 @@ jobs: SLACK_MESSAGE: 'Nightly Docker build of Houston failed :sob:' SLACK_USERNAME: "GitHub CI" SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + + - uses: actions/checkout@v2 + with: + submodules: true From 76c2703f74f14a6a9b1764d249fe7418adff3707 Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 09:56:34 -0800 Subject: [PATCH 04/14] changed publish to be indicated with label prs must be labeled with build-image label and be out of draft to publish to docker --- .github/workflows/docker-publish.yaml | 40 +-------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 06b5bbdd8..200d6a9e3 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -27,7 +27,7 @@ jobs: ref: main - uses: actions/checkout@v2 - if: github.event_name == 'release' + if: ${{ !github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'build-image') }} with: submodules: true @@ -100,41 +100,3 @@ jobs: if: github.event_name == 'schedule' run: | ./scripts/utils/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/houston - - # Notify status in Slack - - name: Slack Notification - if: ${{ failure() && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Tagged / Latest Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - - - name: Slack Notification - if: ${{ failure() && github.ref == 'refs/heads/main' }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Bleeding Edge Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - - - name: Slack Notification - if: ${{ failure() && github.event_name == 'schedule' }} - uses: rtCamp/action-slack-notify@master - env: - SLACK_CHANNEL: dev-houston - SLACK_COLOR: '#FF0000' - SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png - SLACK_MESSAGE: 'Nightly Docker build of Houston failed :sob:' - SLACK_USERNAME: "GitHub CI" - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - - - uses: actions/checkout@v2 - with: - submodules: true From ab66215f782bceae11e094b2503176f6119c3708 Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 14:55:30 -0800 Subject: [PATCH 05/14] update docker username --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 200d6a9e3..b94577cc6 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -54,7 +54,7 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: wildmeorg + username: ${{ github.actor }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Login to GitHub Container Registry From fe4a1e9475b23278d4f36588c52c4b75cd77b79c Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 15:15:22 -0800 Subject: [PATCH 06/14] login action update --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index b94577cc6..8e5c9d028 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -52,13 +52,13 @@ jobs: # Log into container registries - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ github.actor }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.actor }} From e2a93adeac9d1b1803dd03b5ea4066e0542e4d28 Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 15:26:10 -0800 Subject: [PATCH 07/14] login action v2 --- .github/workflows/docker-publish.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 8e5c9d028..e55317de7 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -54,11 +54,12 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: + registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v1 with: registry: ghcr.io username: ${{ github.actor }} From 0339f587aa13e0be53d5698e68a66499d89ab68c Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 15:27:34 -0800 Subject: [PATCH 08/14] revert checkout change --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index e55317de7..ec5ec2347 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -27,7 +27,7 @@ jobs: ref: main - uses: actions/checkout@v2 - if: ${{ !github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'build-image') }} + if: github.event)name != 'schedule' with: submodules: true From 2fa5db9a7b4f64c0d586251d58f004e3b8838a50 Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 16:05:36 -0800 Subject: [PATCH 09/14] avoided github token --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index ec5ec2347..93db9b5cc 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -55,7 +55,7 @@ jobs: uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.actor }} + username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Login to GitHub Container Registry From fcd1f58be91ac13ba52b8df36ece1f2db548d8de Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 18:14:01 -0800 Subject: [PATCH 10/14] adjust docker login --- .github/workflows/docker-publish.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 93db9b5cc..3f2236065 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -54,7 +54,6 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - registry: ghcr.io username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} From 0291540543f5bc049a34bebc6246f2d2c5148ddd Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 18:21:20 -0800 Subject: [PATCH 11/14] try login v3 --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 3f2236065..80d9370af 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -52,7 +52,7 @@ jobs: # Log into container registries - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} From deaf3b200a4635dac4143705fa07b5818accbbbe Mon Sep 17 00:00:00 2001 From: Tanya Date: Wed, 24 Jan 2024 18:32:02 -0800 Subject: [PATCH 12/14] syntax correction --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 80d9370af..b8c572a05 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -51,8 +51,8 @@ jobs: ./scripts/codex/buildx.sh # Log into container registries - - name: Login to DockerHub - uses: docker/login-action@v3 + - name: Docker Login + uses: docker/login-action@v3.0.0 with: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} From a03d7cb314ae8584b4d0d04cba0649348478fdd8 Mon Sep 17 00:00:00 2001 From: Tanya Date: Thu, 25 Jan 2024 09:47:11 -0800 Subject: [PATCH 13/14] new token --- .github/workflows/docker-publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index b8c572a05..108b1209f 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -54,8 +54,8 @@ jobs: - name: Docker Login uses: docker/login-action@v3.0.0 with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} + username: ${{ secrets.DOCKER_USER_SECRET }} + password: ${{ secrets.DOCKER_TOKEN_SECRET }} - name: Login to GitHub Container Registry uses: docker/login-action@v1 From a20655a2c50838e87f5a29def9bc508d8ae09d47 Mon Sep 17 00:00:00 2001 From: Tanya Date: Thu, 25 Jan 2024 09:49:20 -0800 Subject: [PATCH 14/14] typo --- .github/workflows/docker-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 108b1209f..125a16205 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -27,7 +27,7 @@ jobs: ref: main - uses: actions/checkout@v2 - if: github.event)name != 'schedule' + if: github.event_name != 'schedule' with: submodules: true