From 9fa5c9b7bba5d6e1258f11b97e832d5eeb28edea Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Thu, 7 Nov 2024 22:39:10 +0530 Subject: [PATCH] chore: update tooling, differ, etc Signed-off-by: K.B.Dharun Krishna --- .github/workflows/differ.yml | 33 ------------------- .github/workflows/vib-build.yml | 26 +++++++++++++++ modules/00-vanilla-apx-gui.yml | 2 +- modules/00-vanilla-first-setup.yml | 2 +- modules/00-vanilla-prime-utility.yml | 2 +- modules/00-vanilla-sideload.yml | 2 +- modules/00-vanilla-system-operator.yml | 8 ++--- modules/00-vanilla-updates-utility.yml | 2 +- .../10-vanilla-abroot-rollback-notifier.yml | 2 +- modules/80-printers.yml | 1 + 10 files changed, 37 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/differ.yml diff --git a/.github/workflows/differ.yml b/.github/workflows/differ.yml deleted file mode 100644 index 107dffc..0000000 --- a/.github/workflows/differ.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Differ - -on: - workflow_run: - workflows: [Vib Build] - types: - - completed - -jobs: - differ: - runs-on: ubuntu-latest - container: - image: ghcr.io/vanilla-os/desktop:main - if: github.repository == 'vanilla-os/desktop-image' - - 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/desktop/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/desktop/new - lpkg --lock diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml index f943c5d..c6f200d 100644 --- a/.github/workflows/vib-build.yml +++ b/.github/workflows/vib-build.yml @@ -113,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/desktop:main + if: github.repository == 'vanilla-os/desktop-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/desktop/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/desktop/new + lpkg --lock diff --git a/modules/00-vanilla-apx-gui.yml b/modules/00-vanilla-apx-gui.yml index f38d971..5b78e36 100644 --- a/modules/00-vanilla-apx-gui.yml +++ b/modules/00-vanilla-apx-gui.yml @@ -5,7 +5,7 @@ buildflags: source: type: git url: https://github.com/Vanilla-OS/apx-gui - tag: v1.0.3 + tag: v1.0.4 modules: - name: apx-gui-deps-install type: apt diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml index f8be514..94775c6 100644 --- a/modules/00-vanilla-first-setup.yml +++ b/modules/00-vanilla-first-setup.yml @@ -3,7 +3,7 @@ type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/first-setup.git - tag: v2.2.3 + tag: v2.2.4 paths: - vanilla-first-setup modules: diff --git a/modules/00-vanilla-prime-utility.yml b/modules/00-vanilla-prime-utility.yml index ba79623..f0e4e09 100644 --- a/modules/00-vanilla-prime-utility.yml +++ b/modules/00-vanilla-prime-utility.yml @@ -4,7 +4,7 @@ type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/vanilla-prime-utility - tag: v1.0.3 + tag: v1.0.4 paths: - vanilla-prime-utility modules: diff --git a/modules/00-vanilla-sideload.yml b/modules/00-vanilla-sideload.yml index 6d663fe..2f2eb39 100644 --- a/modules/00-vanilla-sideload.yml +++ b/modules/00-vanilla-sideload.yml @@ -3,7 +3,7 @@ type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/sideload-utility - tag: v1.0.0 + tag: v1.0.1 paths: - vanilla-sideload modules: diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml index cf47ed3..6d201a1 100644 --- a/modules/00-vanilla-system-operator.yml +++ b/modules/00-vanilla-system-operator.yml @@ -2,8 +2,8 @@ name: vso type: shell source: type: tar - url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.3/vso.tar.gz - checksum: 63673c9f76e41b17623c2b5676dc80c8125512d381ac0ef9a45b9b5aa0bc4b69 + url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.4/vso.tar.gz + checksum: cd65bcfcfcddd6f7095ba5db7a79a23e9d4fcffd11113e372de916b40719570e commands: - mkdir -p /usr/bin - cp /sources/vso/vso /usr/bin/vso @@ -13,8 +13,8 @@ modules: type: shell source: type: tar - url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.3/vso-man.tar.gz - checksum: d38b5930ccae7880e9d195c709cf9480690a42900b3d2e7c603b1efb3cf3beea + url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.4/vso-man.tar.gz + checksum: ad39ca5b7fb301d102345bfb7e92fd32cdd24f0348fbaae134eeb07eea1c9b4f commands: - mv /sources/vso-manpage/man/vso.1 /usr/share/man/man1/ diff --git a/modules/00-vanilla-updates-utility.yml b/modules/00-vanilla-updates-utility.yml index 7c2abdd..ff09ab3 100644 --- a/modules/00-vanilla-updates-utility.yml +++ b/modules/00-vanilla-updates-utility.yml @@ -5,7 +5,7 @@ buildflags: source: type: git url: https://github.com/Vanilla-OS/vanilla-updates-utility - tag: v1.0.1 + tag: v1.0.2 modules: - name: vanilla-updates-utility-deps-install type: apt diff --git a/modules/10-vanilla-abroot-rollback-notifier.yml b/modules/10-vanilla-abroot-rollback-notifier.yml index ff82529..8f3b2f2 100644 --- a/modules/10-vanilla-abroot-rollback-notifier.yml +++ b/modules/10-vanilla-abroot-rollback-notifier.yml @@ -5,7 +5,7 @@ buildflags: source: type: git url: https://github.com/Vanilla-OS/abroot-rollback-notifier - tag: v1.0.0 + tag: v1.0.1 modules: - name: abroot-rollback-notifier-deps-install type: apt diff --git a/modules/80-printers.yml b/modules/80-printers.yml index 3959d7a..72470ff 100644 --- a/modules/80-printers.yml +++ b/modules/80-printers.yml @@ -6,6 +6,7 @@ source: - cups - cups-pk-helper - cups-filters + - libcupsimage2 - printer-driver-brlaser # Brother - printer-driver-escpr # Epson