Update release workflow

Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Oct 27, 2023 · e9f4660 · e9f4660
1 parent 9c55b9d
commit e9f4660
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -31,14 +31,10 @@ jobs:
           version: latest
           args: release --rm-dist
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.ELEMENTAL_BOT_GITHUB_TOKEN }}
 
   release-images:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: ['x86_64']
-        flavor: ['green', 'tumbleweed']
     steps:
       - uses: actions/checkout@v3
       - name: Login to GitHub Container Registry
@@ -47,6 +43,10 @@ jobs:
           registry: ghcr.io
           username: ${{ secrets.ELEMENTAL_BOT_GITHUB_USERNAME }}
           password: ${{ secrets.ELEMENTAL_BOT_GITHUB_TOKEN }}
-      - name: Build example image
+      - name: Build toolkit image
+          make TOOLKIT_REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-cli VERSION=$(git describe --abbrev=0 --tags) build push-toolkit
+          make PLATFORM=linux/arm64,linux/amd64 TOOLKIT_REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-cli VERSION=latest build push-toolkit
+      - name: Build green example
         run: |
-          make ARCH=${{ matrix.arch }} FLAVOR=${{ matrix.flavor }} TOOLKIT_REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-cli REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-${{ matrix.flavor}} build-os push-os push-toolkit
+          make FLAVOR=green REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-${{ matrix.flavor}} VERSION=$(git describe --abbrev=0 --tags) build-os push-os
+          make FLAVOR=tumbleweed REPO=ghcr.io/${{ github.workspace }}/${{ github.repository }}/elemental-${{ matrix.flavor}} VERSION=$(git describe --abbrev=0 --tags) build-os push-os