Merge pull request #29 from regolith-linux/chore-add-noble

add noble to build
regolith-linux · Feb 16, 2024 · 58bb74e · 58bb74e
2 parents 2fd6c64 + d71bd3d
commit 58bb74e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/.github/workflows/build-deb-v4.yml b/.github/workflows/build-deb-v4.yml
@@ -20,6 +20,8 @@ jobs:
           ubuntu-jammy-arm64, 
           ubuntu-mantic-amd64,
           ubuntu-mantic-arm64,
+          ubuntu-noble-amd64,
+          ubuntu-noble-arm64,
           debian-bullseye-amd64,
           debian-bullseye-arm64,
           debian-bookworm-amd64,
@@ -32,6 +34,14 @@ jobs:
             distro-codename: debian-testing-amd64 # debian testing is never released
           - stage: release-3_1
             distro-codename: debian-testing-arm64 # debian testing is never released
+          - stage: release-3_1
+            distro-codename: ubuntu-noble-arm64   # enable w/ 3.2
+          - stage: release-3_1
+            distro-codename: ubuntu-noble-amd64
+          - stage: testing
+            distro-codename: ubuntu-noble-arm64   # enable once everything builds in unstable
+          - stage: testing
+            distro-codename: ubuntu-noble-amd64
         include:
           - distro-codename: ubuntu-focal-amd64
             host-os: ubuntu-20.04
@@ -63,6 +73,16 @@ jobs:
             arch: arm64
             distro: ubuntu
             codename: mantic
+          - distro-codename: ubuntu-noble-amd64
+            host-os: [self-hosted, Linux, X64, noble]
+            arch: amd64
+            distro: ubuntu
+            codename: noble
+          - distro-codename: ubuntu-noble-arm64
+            host-os: [self-hosted, Linux, arm64, noble]
+            arch: arm64
+            distro: ubuntu
+            codename: noble
           - distro-codename: debian-bullseye-amd64
             host-os: [self-hosted, Linux, X64, bullseye]
             arch: amd64

diff --git a/.github/workflows/test-desktop-installable2.yml b/.github/workflows/test-desktop-installable2.yml
@@ -114,8 +114,6 @@ jobs:
         exclude:
           - stage: release-3_0
             wm: regolith-session-sway
-          - stage: release-3_1
-            wm: regolith-session-sway
     steps:
       - name: Test ${{ matrix.stage }} ${{ matrix.distro-codename }} ${{ matrix.arch }}
         uses: kgilmer/[email protected]
@@ -127,7 +125,7 @@ jobs:
             runs-on: ${{ matrix.host-os }}
             strategy:
               matrix:
-                stage: [unstable, testing] #, release-3_1]
+                stage: [unstable, testing, release-3_1]
                 distro-codename: [ubuntu-mantic]
                 arch: [amd64, arm64]
                 wm: [regolith-session-flashback, regolith-session-sway]