Move CI configuration to top level

Let's make it easier to run the CI stuff locally by moving it to the
top level directory.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index efb72166333dab017f2b134810c17d8f5937eb45..f909a2a408cfcf1ba08122f676ea8a1e9b5a2b56 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,9 +84,6 @@ jobs:
     concurrency:
       group: ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.format }}-${{ github.ref }}
       cancel-in-progress: true
-    defaults:
-      run:
-        working-directory: ./.github
     strategy:
       fail-fast: false
       matrix:
@@ -121,7 +118,7 @@ jobs:
 
     - name: Configure ${{ matrix.distro }}/${{ matrix.format }}
       run: |
-        tee mkosi.conf.d/00-ci.conf <<- EOF
+        tee mkosi.conf <<- EOF
         [Distribution]
         Distribution=${{ matrix.distro }}
 
@@ -137,7 +134,7 @@ jobs:
     # FIXME: Remove when Arch/Debian/Ubuntu ship systemd v253
     - name: Mask systemd-resolved
       if: matrix.format == 'directory'
-      run: sudo systemctl --root image mask systemd-resolved
+      run: sudo systemctl --root mkosi.output/image mask systemd-resolved
 
     - name: Boot ${{ matrix.distro }}/${{ matrix.format }} systemd-nspawn
       if: matrix.format == 'disk' || matrix.format == 'directory'

diff --git a/.gitignore b/.gitignore
index b476dc13a634f5502ae7e389d2a7e88f1cdc0234..74ccb6a092ab734224f246564e8746c4de9f3119 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@
 /mkosi.build
 /mkosi.egg-info
 /mkosi.extra
+!mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
+!mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
 /mkosi.nspawn
 /mkosi.rootpw
 /mkosi.conf

diff --git a/NEWS.md b/NEWS.md
index 7fedf2b423012a0450f9d0a2b42d30ec84d50c7b..d4643ea1b11fde8fea730d8875089fd250068929 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # mkosi Changelog
 
+## v19
+
+- The mkosi repository itself now ships configuration to build basic
+  bootable images that can be used to test mkosi.
+
 ## v18
 
 - `$SCRIPT` was renamed to `$CHROOT_SCRIPT`. `$SCRIPT` can still be used

diff --git a/.github/mkosi.conf.d/10-common.conf b/mkosi.conf.d/10-common.conf
similarity index 100%
rename from .github/mkosi.conf.d/10-common.conf
rename to mkosi.conf.d/10-common.conf

diff --git a/.github/mkosi.conf.d/20-arch.conf b/mkosi.conf.d/20-arch.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-arch.conf
rename to mkosi.conf.d/20-arch.conf

diff --git a/.github/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-centos.conf
rename to mkosi.conf.d/20-centos.conf

diff --git a/.github/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-debian.conf
rename to mkosi.conf.d/20-debian.conf

diff --git a/.github/mkosi.conf.d/20-fedora.conf b/mkosi.conf.d/20-fedora.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-fedora.conf
rename to mkosi.conf.d/20-fedora.conf

diff --git a/.github/mkosi.conf.d/20-opensuse.conf b/mkosi.conf.d/20-opensuse.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-opensuse.conf
rename to mkosi.conf.d/20-opensuse.conf

diff --git a/.github/mkosi.conf.d/20-rhel-ubi.conf b/mkosi.conf.d/20-rhel-ubi.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-rhel-ubi.conf
rename to mkosi.conf.d/20-rhel-ubi.conf

diff --git a/.github/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf
similarity index 100%
rename from .github/mkosi.conf.d/20-ubuntu.conf
rename to mkosi.conf.d/20-ubuntu.conf

diff --git a/.github/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh b/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
similarity index 100%
rename from .github/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh
rename to mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh

diff --git a/.github/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service b/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
similarity index 100%
rename from .github/mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service
rename to mkosi.extra/usr/lib/systemd/system/mkosi-check-and-shutdown.service