diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0ecf509b8..62b9c0313 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -90,48 +90,3 @@ jobs: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} dist-newstyle key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-cabal-${{ hashFiles('./.plan.json') }} - - ghcjs: - name: ubuntu-latest / ghcjs 8.6 - runs-on: "ubuntu-latest" - - steps: - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v20 - with: - extra_nix_config: | - trusted-public-keys = ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=1aba6f367982bd6dd78ec2fda75ab246a62d32c5 cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= - substituters = https://nixcache.reflex-frp.org https://cache.nixos.org/ - nix_path: nixpkgs=channel:release-22.11 - - - name: Setup - run: | - # Override cabal.project with the lightweight GHCJS one - cp cabal.ghcjs.project cabal.project - cat cabal.project - nix-shell ghcjs.nix --run "cabal v2-update && cabal v2-freeze" - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~/.cabal/store - dist-newstyle - key: ${{ runner.os }}-ghcjs8.6-cabal-${{ hashFiles('./.plan.json') }} - restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}- - - - name: Build - run: | - nix-shell ghcjs.nix --run "cabal v2-build --ghcjs --enable-tests --enable-benchmarks all" - - - name: Tests - run: | - nix-shell ghcjs.nix --run ".github/run-ghcjs-tests.sh" - - - name: Save cache - uses: actions/cache/save@v4 - if: always() - with: - path: | - ~/.cabal/store - dist-newstyle - key: ${{ runner.os }}-ghcjs8.6-${{ hashFiles('cabal.project.freeze') }} diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal index 70e2ce35f..072c45017 100644 --- a/servant-client-core/servant-client-core.cabal +++ b/servant-client-core/servant-client-core.cabal @@ -17,7 +17,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2 - , GHCJS ==8.6.0.1 extra-source-files: CHANGELOG.md diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal index 53e0d0a47..80a712788 100644 --- a/servant-client/servant-client.cabal +++ b/servant-client/servant-client.cabal @@ -21,7 +21,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2 - , GHCJS ==8.6.0.1 extra-source-files: CHANGELOG.md diff --git a/servant/servant.cabal b/servant/servant.cabal index 1d68bf9de..d1ca6a52b 100644 --- a/servant/servant.cabal +++ b/servant/servant.cabal @@ -20,7 +20,6 @@ maintainer: haskell-servant-maintainers@googlegroups.com copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors build-type: Simple tested-with: GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.8, GHC ==9.4.8, GHC ==9.6.4, GHC ==9.8.2 - , GHCJS ==8.6.0.1 extra-source-files: CHANGELOG.md