change build so there are two separate packages for normal and nvidia

Author: NextRaven10

.github/workflows/build.yml

@@ -35,9 +35,9 @@ jobs:
       matrix:
         include:
           - base_image: "ghcr.io/ublue-os/bazzite:stable"
-            image_suffix: "amd-intel"
+            image_suffix: ""
           - base_image: "ghcr.io/ublue-os/bazzite-nvidia:stable"
-            image_suffix: "nvidia"
+            image_suffix: "-nvidia"
 
     env:
       BASE_IMAGE: ${{ matrix.base_image }}
@@ -81,9 +81,9 @@ jobs:
           # This generates all the tags for your image, you can add custom tags here too!
           # Default tags are "$DEFAULT_TAG" and "$DEFAULT_TAG.$date".
           tags: |
-            type=raw,value=${{ env.DEFAULT_TAG }}-${{ matrix.image_suffix }}
-            type=raw,value=${{ env.DEFAULT_TAG }}-${{ matrix.image_suffix }}.{{date 'YYYYMMDD'}}
-            type=raw,value={{date 'YYYYMMDD'}}-${{ matrix.image_suffix }}
+            type=raw,value=${{ env.DEFAULT_TAG }}${{ matrix.image_suffix }}
+            type=raw,value=${{ env.DEFAULT_TAG }}${{ matrix.image_suffix }}.{{date 'YYYYMMDD'}}
+            type=raw,value={{date 'YYYYMMDD'}}${{ matrix.image_suffix }}
             type=sha,enable=${{ github.event_name == 'pull_request' }}
             type=ref,event=pr
           labels: |
@@ -113,7 +113,7 @@ jobs:
             ./Containerfile
           # Postfix image name with -custom to make it a little more descriptive
           # Syntax: https://docs.github.com/en/actions/learn-github-actions/expressions#format
-          image: ${{ env.IMAGE_NAME }}
+          image: ${{ env.IMAGE_NAME }}${{ matrix.image_suffix }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           oci: false
@@ -163,7 +163,7 @@ jobs:
           REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           registry: ${{ env.IMAGE_REGISTRY }}
-          image: ${{ env.IMAGE_NAME }}
+          image: ${{ env.IMAGE_NAME }}${{ matrix.image_suffix }}
           tags: ${{ steps.metadata.outputs.tags }}
           username: ${{ env.ACTOR_LC }}
           password: ${{ env.REGISTRY_PASSWORD }}
@@ -181,7 +181,7 @@ jobs:
       - name: Sign container image
         if: github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
         run: |
-          IMAGE_FULL="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}"
+          IMAGE_FULL="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}${{ matrix.image_suffix }}"
           for tag in ${{ steps.metadata.outputs.tags }}; do
             cosign sign -y --key env://COSIGN_PRIVATE_KEY $IMAGE_FULL:$tag
           done