Skip to content

Commit

Permalink
chore: update tooling, differ, etc
Browse files Browse the repository at this point in the history
Signed-off-by: K.B.Dharun Krishna <[email protected]>
  • Loading branch information
kbdharun committed Nov 7, 2024
1 parent b98630f commit 9fa5c9b
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 43 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/differ.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/00-vanilla-apx-gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/00-vanilla-first-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion modules/00-vanilla-prime-utility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion modules/00-vanilla-sideload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions modules/00-vanilla-system-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion modules/00-vanilla-updates-utility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/10-vanilla-abroot-rollback-notifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions modules/80-printers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ source:
- cups
- cups-pk-helper
- cups-filters
- libcupsimage2

- printer-driver-brlaser # Brother
- printer-driver-escpr # Epson
Expand Down

0 comments on commit 9fa5c9b

Please sign in to comment.