Skip to content
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

Jump to bottom

Fix autotag triggering tag build #297

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Fix autotag triggering tag build #297

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
8 changes: 7 additions & 1 deletion .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Build and Push Docker Images
on:
push:
workflow_dispatch:
inputs:
tag:
type: string
required: true
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true
Expand All @@ -11,7 +16,8 @@ jobs:
tags:
uses: ./.github/workflows/tags.yml
with:
tag: ${{ github.ref_name }}
# Use tag from workflow_dispatch OR push event
tag: ${{ inputs.tag && inputs.tag || github.ref_name }}
secrets: inherit
base:
uses: ./.github/workflows/build.yml
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- closed
permissions:
contents: write
actions: write
jobs:
release:
if: github.event.pull_request.merged == true
Expand All @@ -24,5 +25,6 @@ jobs:
git tag $TAG
git push origin $TAG
gh release create $TAG
gh workflow run push.yml -f tag=$TAG --ref $TAG
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}