[ci] More nix work

ossia · Jun 9, 2024 · ac5bf9a · ac5bf9a
1 parent e3b2c49
commit ac5bf9a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/builds.yaml b/.github/workflows/builds.yaml
@@ -5,9 +5,10 @@ on: push
 jobs:
   fedora:
     name: Fedora (latest)
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: fedora:latest
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git
@@ -29,9 +30,10 @@ jobs:
 
   suseleap:
     name: OpenSUSE Leap
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: opensuse/leap:latest
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git
@@ -53,10 +55,10 @@ jobs:
 
   susetumbleweed:
     name: OpenSUSE Tumbleweed
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: opensuse/tumbleweed:latest
-      options: --privileged
+      options: --privileged --user $UID:$GROUPS
 
     steps:
       - name: Install git
@@ -78,9 +80,10 @@ jobs:
 
   archqt6:
     name: ArchLinux
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: archlinux:latest
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git
@@ -105,9 +108,10 @@ jobs:
 
   archqt6system:
     name: ArchLinux (System)
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: archlinux:latest
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git

diff --git a/.github/workflows/debian-builds.yaml b/.github/workflows/debian-builds.yaml
@@ -5,9 +5,10 @@ on: push
 jobs:
   debian:
     name: Debian
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: debian:${{ matrix.distro }}
+      options: --user $UID:$GROUPS
 
     strategy:
       matrix:

diff --git a/.github/workflows/embedded.yaml b/.github/workflows/embedded.yaml
@@ -42,9 +42,10 @@ jobs:
 #
   rpi64:
     name: RaspberryPi64
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: archlinux:latest
+      options: --user "$(id -u):$(id -g)"
 
     steps:
       - name: Install git

diff --git a/.github/workflows/nix-builds.yaml b/.github/workflows/nix-builds.yaml
@@ -4,7 +4,7 @@ on: push
 jobs:
   nix:
     name: Nix
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     steps:
 
     - name: Checkout code

diff --git a/.github/workflows/ubuntu-builds.yaml b/.github/workflows/ubuntu-builds.yaml
@@ -3,9 +3,9 @@ name: Ubuntu build
 on: push
 
 jobs:
-  jammy:
+  ubuntu:
     name: Ubuntu 
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -19,6 +19,7 @@ jobs:
 
     container:
       image: ubuntu:${{ matrix.distro }}
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git

diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml
@@ -5,9 +5,10 @@ on: push
 jobs:
   wasm:
     name: WebAssembly
-    runs-on: [self-hosted, ubuntu-latest]
+    runs-on: ubuntu-latest
     container:
       image: archlinux:latest
+      options: --user $UID:$GROUPS
 
     steps:
       - name: Install git

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Releases are available for [Windows, Linux (via AppImage) and Mac OS X](https://
 | Debian (Bookworm, Trixie)         | [![Debian](https://github.com/ossia/score/actions/workflows/debian-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/debian-builds.yaml)                  |
 | Ubuntu (22.04, 23.04, 24.04)      | [![Ubuntu](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/ubuntu-builds.yaml)                  |
 | Raspberry Pi (Bullseye AArch64)   | [![RPi](https://github.com/ossia/score/actions/workflows/embedded.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/embedded.yaml)                               |
-| Nix                               | [![Nix](https://github.com/ossia/score/actions/workflows/nix.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/nix.yaml)                                         |
+| Nix                               | [![Nix](https://github.com/ossia/score/actions/workflows/nix-builds.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/nix-builds.yaml)                                         |
 | WebAssembly                       | [![WASM](https://github.com/ossia/score/actions/workflows/wasm.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/wasm.yaml)                                      |
 | Plug-in templates                 | [![Template check](https://github.com/ossia/score/actions/workflows/templates.yaml/badge.svg)](https://github.com/ossia/score/actions/workflows/templates.yaml)                  |