Skip to content

Commit

Permalink
fix workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
dmaizel committed Dec 10, 2024
1 parent 71b2613 commit 05693b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- "!release-2.8"
pull_request:
branches:
- "master"
- "main"
- "release-*"

concurrency:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tags:
- v*
branches:
- master
- main
- release-*
- dev-*

Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
platform: [linux/amd64]
platform: [linux/amd64, linux/arm64]
target: [workflow-controller, argocli, argoexec]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -84,7 +84,6 @@ jobs:
--platform="${PLATFORM}" \
--target $TARGET \
--provenance=false \
--tag $image_name \
--tag quay.io/$image_name .
build-windows:
Expand All @@ -108,7 +107,7 @@ jobs:
docker_org=$DOCKERIO_ORG
tag=$(basename $GITHUB_REF)
if [ $tag = "master" ]; then
if [ $tag = "main" ]; then
tag="latest"
fi
Expand Down Expand Up @@ -149,7 +148,7 @@ jobs:
docker_org=$DOCKERIO_ORG
tag=$(basename $GITHUB_REF)
if [ $tag = "master" ]; then
if [ $tag = "main" ]; then
tag="latest"
fi
Expand Down Expand Up @@ -196,7 +195,7 @@ jobs:
TARGET: ${{ matrix.target }}
run: |
tag=$(basename $GITHUB_REF)
if [ $tag = "master" ]; then
if [ $tag = "main" ]; then
tag="latest"
fi
Expand All @@ -222,7 +221,7 @@ jobs:
run: |
docker_org=$DOCKERIO_ORG
tag=$(basename $GITHUB_REF)
if [ $tag = "master" ]; then
if [ $tag = "main" ]; then
tag="latest"
fi
Expand Down

0 comments on commit 05693b8

Please sign in to comment.