Testing

wodby · Jan 28, 2025 · d894dc9 · d894dc9
1 parent abd71ca
commit d894dc9
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -14,8 +14,20 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
-  valkey80-amd64:
-    runs-on: ubuntu-latest
+  valkey80-build:
+    strategy:
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64    
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-24.04
+            arch: amd64
+          - platform: linux/arm64
+            runner: ubuntu-24.04-arm 
+            arch: arm64 
+    runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
       - uses: docker/login-action@v3
@@ -26,40 +38,21 @@ jobs:
       - name: build and push
         env:
           VALKEY_VER: ${{ env.VALKEY80 }}
-          TAG: 8.0-amd64
-          PLATFORM: linux/amd64  
-        run: |
-          make buildx-build
-          make buildx-push          
-  valkey80-arm64:
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - uses: docker/setup-buildx-action@v3
-      - name: build and push
-        env:
-          VALKEY_VER: ${{ env.VALKEY80 }}
-          TAG: 8.0-arm64
-          PLATFORM: linux/arm64
+          TAG: 8.0-${{ matrix.arch }}
+          PLATFORM: ${{ matrix.platform }}  
         run: |
           make buildx-build
           make buildx-push
   valkey80:
     runs-on: ubuntu-latest
     needs:
-      - valkey80-amd64
-      - valkey80-arm64
+      - valkey80-build
     steps:
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+      - uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Create Multi-Arch Manifest
+      - name: create multi-arch image
         run: |
           if [[ "${GITHUB_REF}" == refs/heads/main || "${GITHUB_REF}" == refs/tags/* ]]; then
             TAGS=("8.0" "8" "latest")