reorder and remove some haskell-ci steps to allow for custom cabal.pr…

…oject instead of ci-generated cabal.project
agentm · Aug 25, 2024 · 1b95b5d · 1b95b5d
1 parent a8996f0
commit 1b95b5d
Showing 1 changed file with 2 additions and 33 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -125,9 +125,6 @@ jobs:
           $HC --version || true
           $HC --print-project-git-commit-id || true
           $CABAL --version || true
-      - name: update cabal index
-        run: |
-          $CABAL v2-update -v
       - name: install cabal-plan
         run: |
           mkdir -p $HOME/.cabal/bin
@@ -139,37 +136,9 @@ jobs:
           cabal-plan --version
       - name: checkout
         uses: actions/checkout@v4
-        with:
-          path: source
-      - name: initial cabal.project for sdist
-        run: |
-          touch cabal.project
-          echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
-          cat cabal.project
-      - name: sdist
-        run: |
-          mkdir -p sdist
-          $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
-      - name: unpack
-        run: |
-          mkdir -p unpacked
-          find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
-      - name: generate cabal.project
+      - name: update cabal index
         run: |
-          PKGDIR_project_m36="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/project-m36-[0-9.]*')"
-          echo "PKGDIR_project_m36=${PKGDIR_project_m36}" >> "$GITHUB_ENV"
-          rm -f cabal.project cabal.project.local
-          touch cabal.project
-          touch cabal.project.local
-          echo "packages: ${PKGDIR_project_m36}" >> cabal.project
-          echo "package project-m36" >> cabal.project
-          echo "    ghc-options: -Werror=missing-methods" >> cabal.project
-          echo "allow-newer: fast-builder:base" >> cabal.project
-          cat >> cabal.project <<EOF
-          EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(project-m36)$/; }' >> cabal.project.local
-          cat cabal.project
-          cat cabal.project.local
+          $CABAL v2-update -v
       - name: dump install plan
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all