Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-haskell/action.yaml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now the only file that lists both versions. We get much less repetition at the cost of some flexibility (e.g., we can no longer dispatch or call waspc-build with a different compiler version.

Is this important to us @cprecioso?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sodic not that i know of

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inputs:
description: |
The version of Cabal to install.
required: false
default: "latest"
default: "3.10.2.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to pin down cabal too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah always better to pin down stuff. Although cabal specifically is mostly ok to always use the newest version. But one day breaking change will come, so why not pin down :).


cabal-project-dir:
description: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/examples-e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/starters-e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/waspc-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/waspc-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,15 @@ 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
# Ubuntu 20.04.
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
Expand Down Expand Up @@ -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
Expand Down