diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml index f6fc7651..ad478daf 100644 --- a/.github/workflows/cabal.yml +++ b/.github/workflows/cabal.yml @@ -1,4 +1,4 @@ -name: Continuous integration with cabal +name: Continuous integration on: push: @@ -20,8 +20,11 @@ jobs: - "9.6.4" - "9.8.2" - "9.10.1" + operating-system: + - "ubuntu-latest" + - "windows-latest" - runs-on: ubuntu-latest + runs-on: ${{ matrix.operating-system }} steps: - uses: actions/checkout@v4 @@ -35,12 +38,8 @@ jobs: - name: Generate freeze file run: | - cabal update cabal configure --enable-tests --test-show-details=direct cabal freeze --minimize-conflict-set - # 'cabal freeze' will use the nearest index state which might not be exactly equal - # to the index state specified in 'cabal.project' - sed '/^index-state: /d' cabal.project.freeze > dependencies-versions - name: Cache cabal work uses: actions/cache@v4 @@ -50,7 +49,7 @@ jobs: ${{ steps.setup-haskell.outputs.cabal-store }} # We are using the hash of 'cabal.project.local' so that different levels # of optimizations are cached separately - key: ${{ runner.os }}-${{ hashFiles('dependencies-versions', 'cabal.project', 'cabal.project.local') }}-cabal-install + key: ${{ runner.os }}-${{ hashFiles('cabal.project', 'cabal.project.local') }}-cabal-install - name: Build dependencies only run: cabal build all --only-dependencies diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml deleted file mode 100644 index 4b916af8..00000000 --- a/.github/workflows/stack.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Continuous integration with stack - -on: - push: - paths-ignore: - - 'website/*/**' - - 'README.md' - pull_request: - -jobs: - test: - runs-on: ubuntu-latest - strategy: - matrix: - ghcVersion: - [ "8.10.7" - , "9.0.2" - , "9.2.7" - , "9.4.5" - , "9.8.2" - ] - container: "fpco/stack-build-small" - steps: - - name: Check out repository code - uses: actions/checkout@v2 - - name: Cache stack dependencies - uses: actions/cache@v2 - with: - path: ${{ github.workspace }}/stack-root - key: cache-key-${{ runner.os }}-${{ hashFiles(format('stack-ghc-{0}.yaml', matrix.ghcVersion)) }} - - shell: bash - name: run tests - run: | - set -ex - chown $(whoami) "$GITHUB_WORKSPACE" - export STACK_ROOT="$GITHUB_WORKSPACE/stack-root" - export ARGS="--stack-yaml stack-ghc-${{ matrix.ghcVersion }}.yaml" - export ARG='--test-arguments' - export TEST_PACKAGE="distributed-process-tests:" - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestCHInMemory - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestCHInTCP - stack ${ARGS} test $ARG='--plain -t "!SpawnReconnect"' ${TEST_PACKAGE}TestClosure - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestStats - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMxInMemory - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestMxInTCP - stack ${ARGS} test $ARG='--plain' ${TEST_PACKAGE}TestTracingInMemory