diff --git a/.github/workflows/selftest.macos-13.yml b/.github/workflows/selftest.macos-13.yml index ae42cfd..81cde30 100644 --- 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 index d0bd0b0..7ce50ad 100644 --- 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 index b90909c..90f5c02 100644 --- 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 index 6702c17..ec150bf 100644 --- 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 index 0c2761a..846d662 100644 --- 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 index b7ec1ef..86bfacf 100644 --- 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 index d23e9ed..4b03c56 100644 --- 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 index 7f34b7c..28a53a8 100644 --- 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 index 6bad9e4..ffbfc27 100644 --- a/dist/index.js +++ b/dist/index.js @@ -119,7 +119,6 @@ async function install(version) { } await core.group('ghcup install', async () => { await (0, exec_1.exec)(`ghcup install ghc ${version} --set`); - core.addPath('$HOME/.ghcup/bin'); }); } exports.install = install; @@ -174,6 +173,9 @@ const ghcup = __importStar(__nccwpck_require__(474)); const resolve_1 = __nccwpck_require__(778); async function main() { try { + core.addPath('$HOME/.ghcup/bin'); + await (0, exec_1.exec)(`brew install ghcup`); + await (0, exec_1.exec)(`ghcup install ghc`); await workaroundRunnerImageIssue7061(); await addCabalBinToPath(); const requested = core.getInput('ghc-version'); diff --git a/src/ghcup.ts b/src/ghcup.ts index f4bcb59..1050b38 100644 --- 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 index 5c70559..a7adc9b 100644 --- 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');