Skip to content

Commit

Permalink
Switch back to debian testing
Browse files Browse the repository at this point in the history
unstable breaks too much to be useful for CI. To keep CI green, we
stop installing pacman-package-manager in the default images and disable
debian tools tree in CI.
  • Loading branch information
DaanDeMeyer committed Mar 26, 2024
1 parent 4af4500 commit a06c267
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ jobs:
- ubuntu
tools:
- arch
- debian
# TODO: Re-enable once pacman-package-manager is back in testing
# - debian
- fedora
- opensuse
- ubuntu
Expand Down Expand Up @@ -181,7 +182,5 @@ jobs:
--verbose \
-m integration \
--distribution ${{ matrix.distro }} \
$([ "${{ matrix.distro }}" = "debian" ] && echo --release=unstable) \
$([ "${{ matrix.tools }}" = "debian" ] && echo --tools-tree-release=unstable) \
--tools-tree-distribution ${{ matrix.tools }} \
tests/
7 changes: 0 additions & 7 deletions mkosi.conf.d/20-debian-tools.conf

This file was deleted.

2 changes: 1 addition & 1 deletion mkosi.conf.d/20-debian/mkosi.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Distribution=debian

[Distribution]
@Release=unstable
@Release=testing
Repositories=non-free-firmware

[Content]
Expand Down
5 changes: 3 additions & 2 deletions mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Packages=
archlinux-keyring
dbus-broker
dnf
makepkg
pacman-package-manager
# TODO: Add back once pacman-package-manager is back in testing
# makepkg
# pacman-package-manager
swtpm

0 comments on commit a06c267

Please sign in to comment.