Skip to content

Fix the docker-merge workflow #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joyeecheung wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

Fix the docker-merge workflow #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/docker-build-and-publish-linux-amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@ jobs:
platforms: linux/amd64
push: true
tags: ${{ vars.DOCKERHUB_IMAGE }}:nightly-linux-amd64

merge:
needs: [docker]
uses: ./.github/workflows/docker-merge.yml
secrets: inherit
5 changes: 5 additions & 0 deletions .github/workflows/docker-build-and-publish-linux-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@ jobs:
platforms: linux/arm64
push: true
tags: ${{ vars.DOCKERHUB_IMAGE }}:nightly-linux-arm64

merge:
needs: [docker]
uses: ./.github/workflows/docker-merge.yml
secrets: inherit
6 changes: 2 additions & 4 deletions .github/workflows/docker-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Merge images

on:
workflow_run: # Fires when any of the specified workflows complete
workflows: ["Build and Publish Linux ARM64 Image", "Build and Publish Linux AMD64 Image"]
types: [completed]
workflow_dispatch: # allow explicit dispatches from arch-specific builds
workflow_call: # allow this workflow to be called by another workflow

env:
IMAGE: ${{ vars.DOCKERHUB_IMAGE }}
Expand All @@ -15,7 +14,6 @@ concurrency: # ensure only one merge runs at a time

jobs:
merge:
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == vars.NIGHTLY_BRANCH }}
runs-on: ubuntu-latest
steps:
- name: Login to DockerHub
Expand Down