chore: Reduce release yaml (#11335)

Signed-off-by: Tim Collins <[email protected]>
argoproj · Jul 13, 2023 · 36cefc9 · 36cefc9
1 parent af36f2d
commit 36cefc9
Showing 1 changed file with 5 additions and 100 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,102 +20,19 @@ permissions:
  contents: read
 
 jobs:
- build-linux-amd64:
- name: Build & push linux/amd64
+ build-linux:
+ name: Build & push linux
  if: github.repository == 'argoproj/argo-workflows'
  runs-on: ubuntu-latest
  strategy:
  matrix:
- platform: [ linux/amd64 ]
- target: [ workflow-controller, argocli, argoexec ]
- steps:
- - uses: actions/checkout@v3
-
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
- with:
- version: v0.10.4
-
- - name: Cache Docker layers
- uses: actions/cache@v3
- id: cache
- with:
- path: /tmp/.buildx-cache
- key: ${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-${{ github.sha }}
- restore-keys: |
- ${{ runner.os }}-${{ matrix.platform }}-${{ matrix.target }}-buildx-
-
- - name: Docker Login
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERIO_USERNAME }}
- password: ${{ secrets.DOCKERIO_PASSWORD }}
-
- - name: Docker Login
- uses: docker/login-action@v2
- with:
- registry: quay.io
- username: ${{ secrets.QUAYIO_USERNAME }}
- password: ${{ secrets.QUAYIO_PASSWORD }}
-
- - name: Docker Buildx
- env:
- DOCKERIO_ORG: ${{ secrets.DOCKERIO_ORG }}
- PLATFORM: ${{ matrix.platform }}
- TARGET: ${{ matrix.target }}
- run: |
- set -eux
- tag=$(basename $GITHUB_REF)
- if [ $tag = "master" ]; then
- tag="latest"
- fi
- # copied verbatim from Makefile
- GIT_COMMIT=$(git rev-parse HEAD || echo unknown)
- GIT_TAG=$(git describe --exact-match --tags --abbrev=0 2> /dev/null || echo untagged)
- GIT_TREE_STATE=$(if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi)
- 
- tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
- image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
-
- docker buildx build \
- --cache-from "type=local,src=/tmp/.buildx-cache" \
- --cache-to "type=local,dest=/tmp/.buildx-cache" \
- --output "type=image,push=true" \
- --build-arg GIT_COMMIT=$GIT_COMMIT \
- --build-arg GIT_TAG=$GIT_TAG \
- --build-arg GIT_TREE_STATE=$GIT_TREE_STATE \
- --platform="${PLATFORM}" \
- --target $TARGET \
- --provenance=false \
- --tag $image_name .
-
- docker buildx build \
- --cache-from "type=local,src=/tmp/.buildx-cache" \
- --cache-to "type=local,dest=/tmp/.buildx-cache" \
- --output "type=image,push=true" \
- --build-arg GIT_COMMIT=$GIT_COMMIT \
- --build-arg GIT_TAG=$GIT_TAG \
- --build-arg GIT_TREE_STATE=$GIT_TREE_STATE \
- --platform="${PLATFORM}" \
- --target $TARGET \
- --provenance=false \
- --tag quay.io/$image_name .
-
- build-linux-arm64:
- name: Build & push linux/arm64
- if: github.repository == 'argoproj/argo-workflows'
- runs-on: ubuntu-latest
- strategy:
- matrix:
- platform: [ linux/arm64 ]
+ platform: [ linux/amd64, linux/arm64 ]
  target: [ workflow-controller, argocli, argoexec ]
  steps:
  - uses: actions/checkout@v3
 
  - name: Set up QEMU
  uses: docker/setup-qemu-action@v2
- with:
- platforms: arm64
 
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
@@ -159,7 +76,6 @@ jobs:
  GIT_COMMIT=$(git rev-parse HEAD || echo unknown)
  GIT_TAG=$(git describe --exact-match --tags --abbrev=0 2> /dev/null || echo untagged)
  GIT_TREE_STATE=$(if [ -z "`git status --porcelain`" ]; then echo "clean" ; else echo "dirty"; fi)
- 
  tag_suffix=$(echo $PLATFORM | sed -r "s/\//-/g")
  image_name="${DOCKERIO_ORG}/${TARGET}:${tag}-${tag_suffix}"
 
@@ -173,18 +89,7 @@ jobs:
  --platform="${PLATFORM}" \
  --target $TARGET \
  --provenance=false \
- --tag $image_name .
-
- docker buildx build \
- --cache-from "type=local,src=/tmp/.buildx-cache" \
- --cache-to "type=local,dest=/tmp/.buildx-cache" \
- --output "type=image,push=true" \
- --build-arg GIT_COMMIT=$GIT_COMMIT \
- --build-arg GIT_TAG=$GIT_TAG \
- --build-arg GIT_TREE_STATE=$GIT_TREE_STATE \
- --platform="${PLATFORM}" \
- --target $TARGET \
- --provenance=false \
+ --tag $image_name \
  --tag quay.io/$image_name .
 
  build-windows:
@@ -240,7 +145,7 @@ jobs:
  name: Push manifest with all images
  if: github.repository == 'argoproj/argo-workflows'
  runs-on: ubuntu-latest
- needs: [ build-linux-amd64, build-linux-arm64, build-windows ]
+ needs: [ build-linux, build-windows ]
  steps:
  - uses: actions/checkout@v3
  - name: Docker Login