diff --git a/.github/scripts/arm/build.sh b/.github/scripts/arm/build.sh index ea9e349b7..ce32f5db1 100644 --- a/.github/scripts/arm/build.sh +++ b/.github/scripts/arm/build.sh @@ -55,7 +55,6 @@ cd ~/$SCRIPT_DIR git clone https://github.com/PostgREST/postgrest.git cd postgrest git checkout $PGRST_GITHUB_COMMIT -cp cabal.project.non-nix cabal.project cabal v2-update && cabal v2-build # Strip unused symbols from executable diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c169fea4e..3816dc6f5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -164,10 +164,9 @@ jobs: ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-vanilla-0.0.8.yaml ghcup install ghc ${{ matrix.ghc }} ghcup set ghc ${{ matrix.ghc }} - - name: Copy cabal.project & fix caching + - name: Fix caching run: | mkdir ~/.cabal - cp cabal.project.non-nix cabal.project - name: Cache uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4 with: diff --git a/cabal.project b/cabal.project index 313d3fc1f..aa3aa3a9e 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1,4 @@ packages: postgrest.cabal tests: true +package * + ghc-options: -split-sections diff --git a/cabal.project.non-nix b/cabal.project.non-nix deleted file mode 100644 index 3c245a10a..000000000 --- a/cabal.project.non-nix +++ /dev/null @@ -1,18 +0,0 @@ --- Settings to allow building with plain cabal. If this was --- named just cabal.project, it would interfere with the default --- nix build. - -packages: . - -package * - ghc-options: -split-sections - --- Example of depending on a forked repository (the same dependency --- would be mentioned in nix/overlays/haskell-packages.nix and --- stack.yaml, and should refer to a main branch commit of the --- repository. --- --- source-repository-package --- type: git --- location: https://github.com/PostgREST/hasql-pool.git --- tag: 4d462c4d47d762effefc7de6c85eaed55f144f1d