fix: revert previous changes (hacking, needs a proper rewrite to true…

…-up w/ other repos)
ublue-os · Nov 14, 2023 · b3e949d · b3e949d
1 parent 264e3e0
commit b3e949d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_flavor: [nokmods, main]
+        image_flavor: [-nokmods, -main]
         base_name: [surface]
         base_image_name: [silverblue, kinoite, vauxite, sericea, base, lxqt, mate, onyx]
         major_version: [38, 39]
@@ -42,11 +42,11 @@ jobs:
             is_stable_version: true
             is_gts_version: true
         exclude:
-          - image_flavor: nokmods
+          - image_flavor: -nokmods
             major_version: 39
-          - image_flavor: main
+          - image_flavor: -main
             major_version: 38
-          - image_flavor: main
+          - image_flavor: -main
             major_version: 37
           - base_image_name: onyx
             major_version: 38
@@ -56,15 +56,15 @@ jobs:
 
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Matrix Variables
         run: |
           echo "BASE_IMAGE_NAME=${{ matrix.base_image_name }}" >> $GITHUB_ENV
           if [[ "${{ matrix.image_flavor }}" =~ "nokmods" || "${{ matrix.image_flavor }}" =~ "main" ]]; then
               echo "IMAGE_NAME=${{ format('{0}-{1}', matrix.base_image_name, matrix.base_name) }}" >> $GITHUB_ENV
           else
-              echo "IMAGE_NAME=${{ format('{0}-{1}-{2}', matrix.base_image_name, matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV
+              echo "IMAGE_NAME=${{ format('{0}-{1}{2}', matrix.base_image_name, matrix.base_name, matrix.image_flavor) }}" >> $GITHUB_ENV
           fi
 
       - name: Generate tags
@@ -118,7 +118,7 @@ jobs:
 
       # Build metadata
       - name: Image metadata
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         id: meta
         with:
           images: |
@@ -151,7 +151,7 @@ jobs:
       # https://github.com/macbre/push-to-ghcr/issues/12
       - name: Lowercase Registry
         id: registry_case
-        uses: ASzc/change-string-case-action@v6
+        uses: ASzc/change-string-case-action@v5
         with:
           string: ${{ env.IMAGE_REGISTRY }}
 
@@ -173,7 +173,7 @@ jobs:
             --disable-content-trust
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io