fixup! Install MacPorts under an arbitrary prefix

melusina-org · Jun 15, 2024 · aa7b477 · aa7b477
1 parent 4cc24c4
commit aa7b477
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -24,11 +24,11 @@ jobs:
       matrix:
         os: ['macos-12', 'macos-13', 'macos-14']
         version: ['2.9.3']
-        prefix: ['/opt/local']
+        prefix: ['local']
         include:
           - os: 'macos-14'
             version: '2.9.3'
-            prefix: '/opt/package'
+            prefix: 'package'
     runs-on: '${{ matrix.os }}'
     name: 'Install MacPorts'
     needs: 'run-testsuite'
@@ -37,7 +37,7 @@ jobs:
       - uses: ./
         id: 'macports'
         with:
-          parameters: 'testsuite/run-testsuite-on-${{ matrix.os }}.yaml'
+          parameters: 'testsuite/run-testsuite-on-${{ matrix.os }}-${{ matrix.prefix }}.yaml'
       - name: 'Validate installed MacPorts version'
         run: >-
           test "$(port version)" = 'Version: ${{ matrix.version }}'

diff --git a/testsuite/run-testsuite-on-macos-12.yaml → ...uite/run-testsuite-on-macos-12-local.yaml b/testsuite/run-testsuite-on-macos-12.yaml → ...uite/run-testsuite-on-macos-12-local.yaml
diff --git a/testsuite/run-testsuite-on-macos-13.yaml → ...uite/run-testsuite-on-macos-13-local.yaml b/testsuite/run-testsuite-on-macos-13.yaml → ...uite/run-testsuite-on-macos-13-local.yaml
diff --git a/testsuite/run-testsuite-on-macos-14.yaml → ...uite/run-testsuite-on-macos-14-local.yaml b/testsuite/run-testsuite-on-macos-14.yaml → ...uite/run-testsuite-on-macos-14-local.yaml