From 05693b8344d70394691e19b30fac2be7706ee43e Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Tue, 10 Dec 2024 13:37:33 +0200 Subject: [PATCH] fix workflows --- .github/workflows/ci-build.yaml | 2 +- .github/workflows/release.yaml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 902e5e048e62..f4bd3c86c156 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -7,7 +7,7 @@ on: - "!release-2.8" pull_request: branches: - - "master" + - "main" - "release-*" concurrency: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e9f46afa2f96..4a6e71f53258 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,7 @@ on: tags: - v* branches: - - master + - main - release-* - dev-* @@ -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 @@ -84,7 +84,6 @@ jobs: --platform="${PLATFORM}" \ --target $TARGET \ --provenance=false \ - --tag $image_name \ --tag quay.io/$image_name . build-windows: @@ -108,7 +107,7 @@ jobs: docker_org=$DOCKERIO_ORG tag=$(basename $GITHUB_REF) - if [ $tag = "master" ]; then + if [ $tag = "main" ]; then tag="latest" fi @@ -149,7 +148,7 @@ jobs: docker_org=$DOCKERIO_ORG tag=$(basename $GITHUB_REF) - if [ $tag = "master" ]; then + if [ $tag = "main" ]; then tag="latest" fi @@ -196,7 +195,7 @@ jobs: TARGET: ${{ matrix.target }} run: | tag=$(basename $GITHUB_REF) - if [ $tag = "master" ]; then + if [ $tag = "main" ]; then tag="latest" fi @@ -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