Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: port to vib-action, add dependabot config #9

Merged
merged 1 commit into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"
7 changes: 2 additions & 5 deletions .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,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/vso:main .

# Push the image to GHCR (Image Registry)
- name: Push To GHCR
if: github.repository == 'vanilla-os/vso-image'
run: |
docker login ghcr.io -u ${{ env.REGISTRY_USER }} -p ${{ env.REGISTRY_PASSWORD }}
docker image push "ghcr.io/vanilla-os/vso: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 vso:validation .

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Containerfile
path: Containerfile
2 changes: 1 addition & 1 deletion includes.container/etc/apt/___apt.conf.d/99-vso-post
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DPkg::Post-Invoke {"/usr/share/vso/hooks/apt-post"}
DPkg::Post-Invoke {"/usr/share/vso/hooks/apt-post"}
2 changes: 1 addition & 1 deletion includes.container/etc/apt/___apt.conf.d/99-vso-pre
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DPkg::Pre-Install-Pkgs {"/usr/share/vso/hooks/apt-pre"}
Dpkg::Tools::Options::/usr/share/vso/hooks/apt-pre::Version "1";
Dpkg::Tools::Options::/usr/share/vso/hooks/apt-pre::Version "1";
2 changes: 1 addition & 1 deletion includes.container/usr/bin/abroot
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
host-spawn pkexec abroot "$@"
host-spawn pkexec abroot "$@"
2 changes: 1 addition & 1 deletion includes.container/usr/bin/os-shell
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ for file in /run/host/usr/share/vso/host-exports/*; do
done

target_shell=$(getent passwd $USER | cut -d: -f7)
exec "$target_shell" "$@"
exec "$target_shell" "$@"
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ for target in $targets; do
echo "#!/bin/sh" > /usr/share/apx/distrobox/$target
echo "host-spawn /usr/share/apx/distrobox/$target \$@" >> /usr/share/apx/distrobox/$target
chmod +x /usr/share/apx/distrobox/$target
done
done
2 changes: 1 addition & 1 deletion includes.container/usr/share/vso/hooks/apt-post
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ else
echo "VSO does not work with root privileges, no programs will be exported. Use 'vso export -a $package' to manually export it."
fi

su -c "/usr/bin/vso export -a $package" $username
su -c "/usr/bin/vso export -a $package" $username
2 changes: 1 addition & 1 deletion includes.container/usr/share/vso/hooks/apt-pre
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ read line
while read pack
do
echo "$pack" > /tmp/vso-transaction
done < <( (echo "$line"; cat ) | xargs -d '\n' dpkg-deb --show --showformat='${Package}\n')
done < <( (echo "$line"; cat ) | xargs -d '\n' dpkg-deb --show --showformat='${Package}\n')