ci: Modernize config, build for Debian stable / Fedora latest

ximion · Oct 8, 2023 · 4d2ebc3 · 4d2ebc3
1 parent 9dbc4f6
commit 4d2ebc3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 7 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -11,7 +11,7 @@ jobs:
         dc: [ldc, gdc]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create Build Environment
       run: cd tests/ci/ && podman build -t asgen -f ./Dockerfile-debian-testing .
@@ -22,18 +22,37 @@ jobs:
            ./tests/ci/build-and-test.sh
 
 
-  build-fedora-rawhide:
-    name: Fedora Rawhide
+  build-debian-stable:
+    name: Debian Stable
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dc: [ldc]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Create Build Environment
+      run: cd tests/ci/ && podman build -t asgen -f ./Dockerfile-debian-stable .
+
+    - name: Build & Test
+      continue-on-error: ${{ matrix.dc == 'gdc' }}
+      run: podman run -a stdout -a stderr -e DC=${{ matrix.dc }} -v `pwd`:/build asgen
+           ./tests/ci/build-and-test.sh
+
+
+  build-fedora-latest:
+    name: Fedora Latest
     runs-on: ubuntu-latest
     strategy:
       matrix:
         dc: [ldc, gdc]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create Build Environment
-      run: cd tests/ci/ && podman build -t asgen -f ./Dockerfile-fedora-rawhide .
+      run: cd tests/ci/ && podman build -t asgen -f ./Dockerfile-fedora-latest .
 
     - name: Build & Test
       continue-on-error: ${{ matrix.dc == 'gdc' }}
@@ -45,7 +64,7 @@ jobs:
     name: Ubuntu LTS
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Create Build Environment
       run: sudo ./tests/ci/install-deps-deb.sh

diff --git a/tests/ci/Dockerfile-debian-stable b/tests/ci/Dockerfile-debian-stable
@@ -0,0 +1,18 @@
+#
+# Docker file for AppStream Generator CI tests
+#
+FROM debian:stable
+
+# prepare
+RUN mkdir -p /build/ci/
+
+# install build dependencies
+COPY install-deps-deb.sh /build/ci/
+RUN chmod +x /build/ci/install-deps-deb.sh && /build/ci/install-deps-deb.sh
+
+# install 3rd-party stuff
+COPY ci-install-extern.sh /build/ci/
+RUN chmod +x /build/ci/ci-install-extern.sh && /build/ci/ci-install-extern.sh
+
+# finish
+WORKDIR /build
diff --git a/tests/ci/Dockerfile-fedora-rawhide → tests/ci/Dockerfile-fedora-latest b/tests/ci/Dockerfile-fedora-rawhide → tests/ci/Dockerfile-fedora-latest
@@ -1,7 +1,7 @@
 #
 # Docker file for AppStream Generator CI tests
 #
-FROM registry.fedoraproject.org/fedora:rawhide
+FROM registry.fedoraproject.org/fedora:latest
 
 # prepare
 RUN mkdir -p /build/ci/