Testing

wodby · Jan 28, 2025 · f9206da · f9206da
1 parent d894dc9
commit f9206da
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -10,16 +10,18 @@ on:
 
 env:
   VALKEY80: '8.0.2'
+  VALKEY72: '7.2.8'
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
-  valkey80-build:
+  valkey-build:
     strategy:
       matrix:
         platform:
           - linux/amd64
-          - linux/arm64    
+          - linux/arm64
+        version: [ ${{ env.VALKEY80 }}, ${{ env.VALKEY72 }} ]
         include:
           - platform: linux/amd64
             runner: ubuntu-24.04
@@ -37,16 +39,19 @@ jobs:
       - uses: docker/setup-buildx-action@v3
       - name: build and push
         env:
-          VALKEY_VER: ${{ env.VALKEY80 }}
-          TAG: 8.0-${{ matrix.arch }}
+          VALKEY_VER: ${{ matrix.version }}
+          TAG: ${{ matrix.version }}-${{ matrix.arch }}
           PLATFORM: ${{ matrix.platform }}  
         run: |
           make buildx-build
           make buildx-push
-  valkey80:
+  valkey-push:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [ ${{ env.VALKEY80 }}, ${{ env.VALKEY72 }} ]    
     needs:
-      - valkey80-build
+      - valkey-build
     steps:
       - uses: docker/login-action@v3
         with:
@@ -55,18 +60,21 @@ jobs:
       - name: create multi-arch image
         run: |
           if [[ "${GITHUB_REF}" == refs/heads/main || "${GITHUB_REF}" == refs/tags/* ]]; then
-            TAGS=("8.0" "8" "latest")
-            
+            VERSION=${{ matrix.version }}
+            MINOR_VER="${VERSION%.*}"
+            MAJOR_VER="${VERSION%.*}"
+            TAGS=("${MINOR_VER}" "${MAJOR_VER}" "latest")
+
             if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
               STABILITY_TAG=("${GITHUB_REF##*/}")
               TAGS=("8.0-${STABILITY_TAG}" "8-${STABILITY_TAG}")
             fi
           
-            for TAG in "${TAGS[@]}"; do
-              docker buildx imagetools create -t wodby/valkey:$TAG \
-                wodby/valkey:8.0-amd64 \
-                wodby/valkey:8.0-arm64
-            done
+#            for TAG in "${TAGS[@]}"; do
+#              docker buildx imagetools create -t wodby/valkey:$TAG \
+#                wodby/valkey:8.0-amd64 \
+#                wodby/valkey:8.0-arm64
+#            done
           fi
 
 #  valkey72: