XXX remove

hspec · Dec 12, 2024 · c699bbc · c699bbc
1 parent e01f5a4
commit c699bbc
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/selftest.macos-13.yml b/.github/workflows/selftest.macos-13.yml
@@ -5,7 +5,7 @@ on:
     - cron: 0 0 1 * *
   push:
     branches:
-      - selftest
+      - update
 jobs:
   build:
     name: ${{ matrix.os }} / GHC ${{ matrix.ghc }}
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - macos-13

diff --git a/.github/workflows/selftest.macos-14.yml b/.github/workflows/selftest.macos-14.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - macos-14

diff --git a/.github/workflows/selftest.macos-15.yml b/.github/workflows/selftest.macos-15.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - macos-15

diff --git a/.github/workflows/selftest.ubuntu-20.04.yml b/.github/workflows/selftest.ubuntu-20.04.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-20.04

diff --git a/.github/workflows/selftest.ubuntu-22.04.yml b/.github/workflows/selftest.ubuntu-22.04.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-22.04

diff --git a/.github/workflows/selftest.ubuntu-24.04.yml b/.github/workflows/selftest.ubuntu-24.04.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-24.04

diff --git a/.github/workflows/selftest.windows-2019.yml b/.github/workflows/selftest.windows-2019.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - windows-2019

diff --git a/.github/workflows/selftest.windows-2022.yml b/.github/workflows/selftest.windows-2022.yml
@@ -21,6 +21,7 @@ jobs:
       - run: cabal install alex
       - run: alex --version
     strategy:
+      fail-fast: false
       matrix:
         os:
           - windows-2022

diff --git a/dist/index.js b/dist/index.js
diff --git a/src/ghcup.ts b/src/ghcup.ts
@@ -12,7 +12,6 @@ export async function install(version: string) {
   }
   await core.group('ghcup install', async () => {
     await exec(`ghcup install ghc ${version} --set`);
-    core.addPath('$HOME/.ghcup/bin');
   });
 }
 

diff --git a/src/main.ts b/src/main.ts
@@ -8,6 +8,9 @@ import { installed, resolve, ResolvedVersion } from './resolve';
 
 async function main() {
   try {
+    core.addPath('$HOME/.ghcup/bin');
+    await exec(`brew install ghcup`);
+    await exec(`ghcup install ghc`);
     await workaroundRunnerImageIssue7061();
     await addCabalBinToPath();
     const requested = core.getInput('ghc-version');
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ export async function install(version: string) { @@
       }
       await core.group('ghcup install', async () => {
         await exec(`ghcup install ghc ${version} --set`);
-        core.addPath('$HOME/.ghcup/bin');
       });
     }
@@ Expand Down @@