Version 2 Release (#137)

pimcore · May 15, 2023 · 4b040ce · 4b040ce
1 parent 55ab40d
commit 4b040ce
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,13 +19,14 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { tag: '1.x', php: '8.0', distro: bullseye, tag-suffix: "v1-dev", latest-tag: false }
-                    - { tag: '1.x', php: '8.1', distro: bullseye, tag-suffix: "v1-dev", latest-tag: false }
-                    - { tag: '1.x', php: '8.2', distro: bullseye, tag-suffix: "v1-dev", latest-tag: false }
-                    - { tag: 'v1.3', php: '8.0', distro: bullseye, tag-suffix: "", latest-tag: true }
-                    - { tag: 'v1.3', php: '8.1', distro: bullseye, tag-suffix: "", latest-tag: true }
-                    - { tag: 'v1.3', php: '8.2', distro: bullseye, tag-suffix: "", latest-tag: true }
-                    - { tag: '2.x', php: '8.2', distro: bullseye, tag-suffix: "v2-dev", latest-tag: false }
+                    - { tag: '1.x', php: '8.0', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+                    - { tag: '1.x', php: '8.1', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+                    - { tag: '1.x', php: '8.2', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+                    - { tag: 'v1.3', php: '8.0', distro: bullseye, version-override: "", latest-tag: true }
+                    - { tag: 'v1.3', php: '8.1', distro: bullseye, version-override: "", latest-tag: true }
+                    - { tag: 'v1.3', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
+                    - { tag: 'v2.0', php: '8.2', distro: bullseye, version-override: "", latest-tag: true }
+                    - { tag: '2.x', php: '8.2', distro: bullseye, version-override: "v2-dev", latest-tag: false }
 
         steps:
             -   uses: actions/checkout@v3
@@ -54,7 +55,7 @@ jobs:
             -   name: Configure and build images
                 id: vars
                 env:
-                    TAG_SUFFIX: "${{ matrix.tag-suffix }}"
+                    VERSION_OVERRIDE: "${{ matrix.version-override }}"
                 run: |
                     set -eux;
                                         
@@ -74,8 +75,8 @@ jobs:
                         DEBIAN_VERSION="${{ matrix.distro }}"
                         VERSION="${{ matrix.tag }}"
                         # for the latest dev branch we use "dev" as the version and not the name of the branch
-                        if [ ! -z "$TAG_SUFFIX" ]; then
-                            VERSION="$TAG_SUFFIX"
+                        if [ ! -z "$VERSION_OVERRIDE" ]; then
+                            VERSION="$VERSION_OVERRIDE"
                         fi 
                         
                         PHP_SUB_VERSION=$(docker run -i --rm php:${{ matrix.php }}-fpm-${{ matrix.distro }} php -r 'echo PHP_VERSION;')