Skip to content

Commit

Permalink
feat: port to vib-action, add dependabot config (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
mirkobrombin authored Jan 4, 2024
2 parents ab0a06e + 267d13c commit 03667b9
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 28 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
2 changes: 1 addition & 1 deletion .github/gen_package_list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ for line in $(dpkg -l --no-pager); do
done

packages="[${packages%,}]"
printf "\"packages\":%s\n" "$packages"
printf "\"packages\":%s\n" "$packages"
7 changes: 2 additions & 5 deletions .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Vib
run: |
wget https://github.com/Vanilla-OS/Vib/releases/download/v0.3.1/vib
chmod +x vib
./vib build recipe.yml
- uses: vanilla-os/[email protected]

- name: Build the Docker image
run: docker image build -f Containerfile --tag ghcr.io/vanilla-os/desktop:main .

# Push the image to GHCR (Image Registry)
- name: Push To GHCR
if: github.repository == 'vanilla-os/desktop-image'
run: |
docker login ghcr.io -u ${{ env.REGISTRY_USER }} -p ${{ env.REGISTRY_PASSWORD }}
docker image push "ghcr.io/vanilla-os/desktop:main"
8 changes: 2 additions & 6 deletions .github/workflows/vib-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Vib
run: |
wget https://github.com/Vanilla-OS/Vib/releases/download/v0.3.1/vib
chmod +x vib
./vib build recipe.yml
- uses: vanilla-os/[email protected]

- name: Build the Docker image
run: docker image build -f Containerfile --tag vanillaos/desktop .

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Containerfile
path: Containerfile
2 changes: 1 addition & 1 deletion includes.container/etc/modules.load.d/waydroid.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binder_linux
ashmem_linux
ashmem_linux
2 changes: 1 addition & 1 deletion includes.container/etc/udev/rules.d/99-waydroid.rules
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
KERNEL=="binder", NAME="%k", MODE="0666"
KERNEL=="ashmem", NAMe="%k", MODE="0666"
KERNEL=="ashmem", NAMe="%k", MODE="0666"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[org.gnome.shell]
enabled-extensions=['[email protected]']
disable-user-extensions=false
disable-user-extensions=false
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/podman</annotate>
</action>
</policyconfig>
</policyconfig>
21 changes: 11 additions & 10 deletions includes.container/usr/share/vso/apx/package-managers/apt.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: apt
model: 2
needsudo: true
cmdautoremove: autoremove
cmdclean: clean
cmdinstall: install
cmdlist: list
cmdpurge: purge
cmdremove: remove
cmdsearch: search
cmdshow: show
cmdupdate: update
cmdupgrade: upgrade
cmdautoremove: apt autoremove
cmdclean: apt clean
cmdinstall: apt install
cmdlist: apt list
cmdpurge: apt purge
cmdremove: apt remove
cmdsearch: apt search
cmdshow: apt show
cmdupdate: apt update
cmdupgrade: apt upgrade
builtin: true
1 change: 0 additions & 1 deletion modules/02-waydroid-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ modules:
type: shell
commands:
- apt install -y linux-headers-amd64

2 changes: 1 addition & 1 deletion modules/170-gnome-software-vso-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: gs-vso-plugin
type: shell
commands:
- curl -L -O https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/continuous/libgs_plugin_vso.so
- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/
- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/

0 comments on commit 03667b9

Please sign in to comment.