Make callable installer workflow

iainelder · Jul 1, 2024 · 1ec070c · 1ec070c
1 parent 3ebdc30
commit 1ec070c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 24 deletions.
diff --git a/.github/workflows/test_changes.yml b/.github/workflows/test_changes.yml
@@ -54,27 +54,6 @@ jobs:
     name: Test installers
     needs: list_installers
     if: needs.list_installers.outputs.installers != '[]'
-    runs-on: ubuntu-latest
-    container:
-      image: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        installer: ${{ fromJson(needs.list_installers.outputs.installers) }}
-        os: ["ubuntu:20.04", "ubuntu:22.04"]
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Prepare Docker
-        run: ./scripts/prepare_docker.bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install ${{matrix.installer}}
-        shell: su norm --command "bash --login {0}"
-        run: programs/${{matrix.installer}}/install.bash
-
-      - name: Install ${{matrix.installer}} again (test idempotency)
-        shell: su norm --command "bash --login {0}"
-        run: programs/${{matrix.installer}}/install.bash
+    uses: ./.github/workflows/test_installers.yml
+    with:
+      installers: ${{needs.list_installers.outputs.installers}}
diff --git a/.github/workflows/test_installers.yml b/.github/workflows/test_installers.yml
@@ -0,0 +1,35 @@
+name: Test installers
+on:
+  workflow_call:
+    inputs:
+      installers:
+        description: A JSON list of install names
+        required: true
+        type: string
+
+  test_installers:
+    name: Test installers
+    runs-on: ubuntu-latest
+    container:
+      image: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        installer: ${{ fromJson(inputs.installers) }}
+        os: ["ubuntu:20.04", "ubuntu:22.04"]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Prepare Docker
+        run: ./scripts/prepare_docker.bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install ${{matrix.installer}}
+        shell: su norm --command "bash --login {0}"
+        run: programs/${{matrix.installer}}/install.bash
+
+      - name: Install ${{matrix.installer}} again (test idempotency)
+        shell: su norm --command "bash --login {0}"
+        run: programs/${{matrix.installer}}/install.bash