From 3ad5cc610cb5e9850d54cb72be94c2fa94ac7bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Sodi=C4=87?= Date: Thu, 9 Oct 2025 09:52:16 +0200 Subject: [PATCH] Remove GHC repetitions --- .github/actions/setup-haskell/action.yaml | 2 +- .github/workflows/examples-e2e-tests.yaml | 2 -- .github/workflows/starters-e2e-tests.yaml | 2 -- .github/workflows/waspc-build.yaml | 10 ---------- .github/workflows/waspc-ci.yaml | 10 ---------- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/.github/actions/setup-haskell/action.yaml b/.github/actions/setup-haskell/action.yaml index da1eb0ba6a..434515cb05 100644 --- a/.github/actions/setup-haskell/action.yaml +++ b/.github/actions/setup-haskell/action.yaml @@ -15,7 +15,7 @@ inputs: description: | The version of Cabal to install. required: false - default: "latest" + default: "3.10.2.0" cabal-project-dir: description: | diff --git a/.github/workflows/examples-e2e-tests.yaml b/.github/workflows/examples-e2e-tests.yaml index fbb459e768..2bf0dc3dda 100644 --- a/.github/workflows/examples-e2e-tests.yaml +++ b/.github/workflows/examples-e2e-tests.yaml @@ -32,8 +32,6 @@ jobs: - uses: ./.github/actions/setup-haskell with: - ghc-version: "9.0.2" - cabal-version: "3.10.2.0" cabal-project-dir: waspc - uses: actions/setup-node@v4 diff --git a/.github/workflows/starters-e2e-tests.yaml b/.github/workflows/starters-e2e-tests.yaml index cfd2a4f5f5..d42177ddc8 100644 --- a/.github/workflows/starters-e2e-tests.yaml +++ b/.github/workflows/starters-e2e-tests.yaml @@ -22,8 +22,6 @@ jobs: - uses: ./.github/actions/setup-haskell with: - ghc-version: "9.0.2" - cabal-version: "3.10.2.0" cabal-project-dir: waspc - uses: actions/setup-node@v4 diff --git a/.github/workflows/waspc-build.yaml b/.github/workflows/waspc-build.yaml index ea6c592b93..3515a5a996 100644 --- a/.github/workflows/waspc-build.yaml +++ b/.github/workflows/waspc-build.yaml @@ -5,21 +5,12 @@ name: Build wasp-cli binaries for multiple platforms on: workflow_dispatch: inputs: - ghc-version: - description: "GHC version to use" - default: "9.0.2" - required: false node-version: description: "Node.js version to use" default: "22" required: false workflow_call: inputs: - ghc-version: - description: "GHC version to use" - default: "9.0.2" - type: string - required: false node-version: description: "Node.js version to use" default: "22" @@ -130,7 +121,6 @@ jobs: - uses: ./.github/actions/setup-haskell with: - ghc-version: ${{ inputs.ghc-version }} extra-cache-key-segment: ${{ matrix.env.static && 'static' || 'default' }} - uses: actions/setup-node@v4 diff --git a/.github/workflows/waspc-ci.yaml b/.github/workflows/waspc-ci.yaml index 514b3fd0a3..d3a1572465 100644 --- a/.github/workflows/waspc-ci.yaml +++ b/.github/workflows/waspc-ci.yaml @@ -47,10 +47,6 @@ jobs: - windows-latest node-version: - "latest" - ghc: - - "9.0.2" - cabal: - - "3.10.2.0" # In addition to the default matrix, we also want to run the build job for # additional Node.js versions, to make sure that Wasp works with them. # To reduce the number of jobs, we only test the Node.js versions on @@ -58,12 +54,8 @@ jobs: include: - os: ubuntu-22.04 node-version: 22 - ghc: "9.0.2" - cabal: "3.10.2.0" - os: ubuntu-22.04 node-version: 24 - ghc: "9.0.2" - cabal: "3.10.2.0" steps: - name: Configure git @@ -91,8 +83,6 @@ jobs: - name: Set up Haskell uses: ./.github/actions/setup-haskell with: - ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} cabal-project-dir: waspc - name: Set up Node