From 11dd5c96b35e67d235fd2c9ac93b8fe6aef8f95f Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 22 Aug 2024 21:31:25 -0400 Subject: [PATCH 1/5] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fb7feff..aa72602 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,7 +4,9 @@ on: push: branches: - main - + repository_dispatch: + types: ['build-trigger'] + jobs: devops: name: Docker image build @@ -45,7 +47,7 @@ jobs: password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Push to Docker Hub (Latest) - if: ${{ github.event_name == 'push' }} + if: ${{ github.event_name == 'push' or github.event_name =='repository_dispatch' }} run: | VERSION=$(echo ${GITHUB_REF} | sed 's#.*/v##') bash ./publish.sh -t latest ${PUBLISH_IMAGES} From 50f089d2c9a5f9095b50835a51c4fedcc9fa97ed Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Thu, 22 Aug 2024 21:33:42 -0400 Subject: [PATCH 2/5] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index aa72602..7f19ea7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - if: github.event_name == 'push' + if: github.event_name == 'push' or github.event_name =='repository_dispatch' with: ref: main From 74e250ed8986dd6e653975149d022994534f0dd7 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 23 Aug 2024 12:59:48 -0400 Subject: [PATCH 3/5] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7f19ea7..fd36c8b 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,7 +3,7 @@ name: Build and upload Docker for Scout on: push: branches: - - main + - buildDepCMaker4Scoutbot repository_dispatch: types: ['build-trigger'] @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 if: github.event_name == 'push' or github.event_name =='repository_dispatch' with: - ref: main + ref: buildDepCMaker4Scoutbot - name: Free Disk space run: | @@ -54,5 +54,4 @@ jobs: env: PUBLISH_IMAGES: ${{ matrix.images }} scout - From 13c7b9d71bff38ecc604afbde24c260514eea8c5 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 23 Aug 2024 13:06:56 -0400 Subject: [PATCH 4/5] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fd36c8b..7215455 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - if: github.event_name == 'push' or github.event_name =='repository_dispatch' + if: ${{ github.event_name == 'push' || github.event_name =='repository_dispatch'}} with: ref: buildDepCMaker4Scoutbot @@ -47,7 +47,7 @@ jobs: password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }} - name: Push to Docker Hub (Latest) - if: ${{ github.event_name == 'push' or github.event_name =='repository_dispatch' }} + if: ${{ github.event_name == 'push' || github.event_name =='repository_dispatch' }} run: | VERSION=$(echo ${GITHUB_REF} | sed 's#.*/v##') bash ./publish.sh -t latest ${PUBLISH_IMAGES} From 81e334cc95c39ca0777c6dc428f555c5d1c9da70 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Fri, 23 Aug 2024 13:38:18 -0400 Subject: [PATCH 5/5] Update docker-image.yml --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 7215455..20a2cf8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,9 +3,9 @@ name: Build and upload Docker for Scout on: push: branches: - - buildDepCMaker4Scoutbot + - main repository_dispatch: - types: ['build-trigger'] + types: build-trigger jobs: devops: @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 if: ${{ github.event_name == 'push' || github.event_name =='repository_dispatch'}} with: - ref: buildDepCMaker4Scoutbot + ref: main - name: Free Disk space run: |