upgrade main branch

.github/workflows/release.yml

@@ -35,7 +35,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: vanilla-os/vib-gh-action@v0.7.4
+      - name: Change tag in recipe.
+        run: |
+          sed 's/ghcr.io\/vanilla-os\/desktop:dev/ghcr.io\/vanilla-os\/desktop:main/' -i recipe.yml
+
+      - uses: vanilla-os/vib-gh-action@v0.8.1
         with:
             recipe: 'recipe.yml'
             plugins: 'Vanilla-OS/vib-fsguard:v1.5.3'

.github/workflows/vib-build.yml

@@ -3,7 +3,7 @@ name: Vib Build
 on:
   push:
     branches:
-      - 'main'
+      - 'dev'
     tags:
       - '*'
   workflow_dispatch:
@@ -18,14 +18,15 @@ jobs:
 
     steps:
     - name: Verify Base Image Integrity
+      if: ${{ github.ref_type == 'tag' }}
       run:
         gh attestation verify oci://ghcr.io/vanilla-os/desktop:main --owner Vanilla-OS
       env:
         GH_TOKEN: ${{ github.token }}
 
   build:
     runs-on: ubuntu-latest
-    needs: verify-image
+    needs: [verify-image]
     permissions:
       contents: write # Allow actions to create release
       packages: write # Allow pushing images to GHCR
@@ -35,7 +36,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: vanilla-os/vib-gh-action@v0.7.4
+    - name: Change tag in recipe
+      if: ${{ github.ref_type == 'tag' }}
+      run: |
+        sed 's/ghcr.io\/vanilla-os\/desktop:dev/ghcr.io\/vanilla-os\/desktop:main/' -i recipe.yml
+
+    - uses: vanilla-os/vib-gh-action@v0.8.1
       with:
         recipe: 'recipe.yml'
         plugins: 'Vanilla-OS/vib-fsguard:v1.5.3'
@@ -51,6 +57,16 @@ jobs:
         echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
         echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/nvidia" >> "$GITHUB_ENV"
 
+    - name: Extra image tag branch
+      if: ${{ github.ref_type != 'tag' }}
+      run: |
+        echo "EXTRA_TAG=ref,event=branch" >> "$GITHUB_ENV"
+
+    - name: Extra image tag release
+      if: ${{ github.ref_type == 'tag' }}
+      run: |
+        echo "EXTRA_TAG=raw,main" >> "$GITHUB_ENV"
+
     - name: Docker meta
       id: docker_meta
       uses: docker/metadata-action@v5
@@ -62,7 +78,7 @@ jobs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{raw}}
           type=semver,pattern=v{{major}}
-          type=ref,event=branch
+          type=${{ env.EXTRA_TAG }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
@@ -97,3 +113,29 @@ jobs:
         subject-name: ${{ env.IMAGE_URL }}
         subject-digest: ${{ steps.push.outputs.digest }}
         push-to-registry: false
+
+  differ:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/vanilla-os/nvidia:main
+    if: github.repository == 'vanilla-os/nvidia-image' && github.ref_type == 'tag'
+    needs: build
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate package diff
+        run: |
+          lpkg --unlock
+          PACKAGE_LIST=$(.github/gen_package_list.sh)
+          apt-get install -y curl
+          IMAGE_DIGEST=$(curl -s -L -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/orgs/Vanilla-OS/packages/container/nvidia/versions | grep -m1 name | sed -E 's/^\s*"name": "(.+)".*$/\1/')
+          curl -X POST \
+          -H 'Accept:application/json' \
+          -H "Authorization:Basic $(echo -n "${{ secrets.DIFFER_USER }}:${{ secrets.DIFFER_PSW }}" | base64)" \
+          -d "{\"digest\":\"${IMAGE_DIGEST}\",${PACKAGE_LIST}}" \
+          ${{ vars.DIFFER_URL }}/images/nvidia/new
+          lpkg --lock

recipe.yml

@@ -2,7 +2,7 @@ name: Vanilla Desktop Nvidia
 id: nvidia
 stages:
 - id: build
-  base: ghcr.io/vanilla-os/desktop:main
+  base: ghcr.io/vanilla-os/desktop:dev
   singlelayer: false
   labels:
     maintainer: Vanilla OS Contributors