-
Notifications
You must be signed in to change notification settings - Fork 0
Tidy up cabal #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
e2108a5
.gitignore
stevladimir 72fce05
Tidy up cabal
stevladimir e1bd8c9
Tidy .gitignore
stevladimir 5cb5caf
Add cabal.project
stevladimir 98a2b96
CI
stevladimir 8f4c177
CI fixes
stevladimir 88c1550
LICENSE
stevladimir f274e44
Regenerate CI
stevladimir c34d2f3
Oops
stevladimir File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| # This GitHub workflow config has been generated by a script via | ||
| # | ||
| # haskell-ci 'github' 'cabal.project' | ||
| # | ||
| # To regenerate the script (for example after adjusting tested-with) run | ||
| # | ||
| # haskell-ci regenerate | ||
| # | ||
| # For more information, see https://github.com/haskell-CI/haskell-ci | ||
| # | ||
| # version: 0.19.20250330 | ||
| # | ||
| # REGENDATA ("0.19.20250330",["github","cabal.project"]) | ||
| # | ||
| name: Haskell-CI | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| jobs: | ||
| linux: | ||
| name: Haskell-CI - Linux - ${{ matrix.compiler }} | ||
| runs-on: ubuntu-24.04 | ||
| timeout-minutes: | ||
| 60 | ||
| container: | ||
| image: buildpack-deps:jammy | ||
| continue-on-error: ${{ matrix.allow-failure }} | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - compiler: ghc-9.8.4 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.8.4 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-9.6.6 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.6.6 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| fail-fast: false | ||
| steps: | ||
| - name: apt-get install | ||
| run: | | ||
| apt-get update | ||
| apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 | ||
| - name: Install GHCup | ||
| run: | | ||
| mkdir -p "$HOME/.ghcup/bin" | ||
| curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" | ||
| chmod a+x "$HOME/.ghcup/bin/ghcup" | ||
| - name: Install cabal-install | ||
| run: | | ||
| "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) | ||
| echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" | ||
| - name: Install GHC (GHCup) | ||
| if: matrix.setup-method == 'ghcup' | ||
| run: | | ||
| "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) | ||
| HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") | ||
| HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') | ||
| HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') | ||
| echo "HC=$HC" >> "$GITHUB_ENV" | ||
| echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" | ||
| echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" | ||
| env: | ||
| HCKIND: ${{ matrix.compilerKind }} | ||
| HCNAME: ${{ matrix.compiler }} | ||
| HCVER: ${{ matrix.compilerVersion }} | ||
| - name: Set PATH and environment variables | ||
| run: | | ||
| echo "$HOME/.cabal/bin" >> $GITHUB_PATH | ||
| echo "LANG=C.UTF-8" >> "$GITHUB_ENV" | ||
| echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" | ||
| echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" | ||
| HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') | ||
| echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" | ||
| echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" | ||
| echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" | ||
| echo "HEADHACKAGE=false" >> "$GITHUB_ENV" | ||
| echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" | ||
| env: | ||
| HCKIND: ${{ matrix.compilerKind }} | ||
| HCNAME: ${{ matrix.compiler }} | ||
| HCVER: ${{ matrix.compilerVersion }} | ||
| - name: env | ||
| run: | | ||
| env | ||
| - name: write cabal config | ||
| run: | | ||
| mkdir -p $CABAL_DIR | ||
| cat >> $CABAL_CONFIG <<EOF | ||
| remote-build-reporting: anonymous | ||
| write-ghc-environment-files: never | ||
| remote-repo-cache: $CABAL_DIR/packages | ||
| logs-dir: $CABAL_DIR/logs | ||
| world-file: $CABAL_DIR/world | ||
| extra-prog-path: $CABAL_DIR/bin | ||
| symlink-bindir: $CABAL_DIR/bin | ||
| installdir: $CABAL_DIR/bin | ||
| build-summary: $CABAL_DIR/logs/build.log | ||
| store-dir: $CABAL_DIR/store | ||
| install-dirs user | ||
| prefix: $CABAL_DIR | ||
| repository hackage.haskell.org | ||
| url: http://hackage.haskell.org/ | ||
| EOF | ||
| cat >> $CABAL_CONFIG <<EOF | ||
| program-default-options | ||
| ghc-options: $GHCJOBS +RTS -M3G -RTS | ||
| EOF | ||
| cat $CABAL_CONFIG | ||
| - name: versions | ||
| run: | | ||
| $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 | ||
| curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > cabal-plan.xz | ||
| echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - | ||
| xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan | ||
| rm -f cabal-plan.xz | ||
| chmod a+x $HOME/.cabal/bin/cabal-plan | ||
| 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/connexpay" >> cabal.project | ||
| echo "packages: $GITHUB_WORKSPACE/source/connexpay-optparse" >> 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 | ||
| run: | | ||
| PKGDIR_connexpay="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/connexpay-[0-9.]*')" | ||
| echo "PKGDIR_connexpay=${PKGDIR_connexpay}" >> "$GITHUB_ENV" | ||
| PKGDIR_connexpay_optparse="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/connexpay-optparse-[0-9.]*')" | ||
| echo "PKGDIR_connexpay_optparse=${PKGDIR_connexpay_optparse}" >> "$GITHUB_ENV" | ||
| rm -f cabal.project cabal.project.local | ||
| touch cabal.project | ||
| touch cabal.project.local | ||
| echo "packages: ${PKGDIR_connexpay}" >> cabal.project | ||
| echo "packages: ${PKGDIR_connexpay_optparse}" >> cabal.project | ||
| echo "package connexpay" >> cabal.project | ||
| echo " ghc-options: -Werror=missing-methods" >> cabal.project | ||
| echo "package connexpay-optparse" >> cabal.project | ||
| echo " ghc-options: -Werror=missing-methods" >> cabal.project | ||
| cat >> cabal.project <<EOF | ||
| source-repository-package | ||
| type: git | ||
| location: https://github.com/typeable/bucks.git | ||
| tag: 9e378b675fe7fb88d5ddb3af068d82eb441f343c | ||
|
|
||
| source-repository-package | ||
| type: git | ||
| location: https://github.com/typeable/req.git | ||
| tag: 8829ac5197f7a4b3f04b7fdfc3ea66cfe70ab0a5 | ||
| EOF | ||
| $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(connexpay|connexpay-optparse)$/; }' >> cabal.project.local | ||
| cat cabal.project | ||
| cat cabal.project.local | ||
| - name: dump install plan | ||
| run: | | ||
| $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all | ||
| cabal-plan | ||
| - name: restore cache | ||
| uses: actions/cache/restore@v4 | ||
| with: | ||
| key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} | ||
| path: ~/.cabal/store | ||
| restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- | ||
| - name: install dependencies | ||
| run: | | ||
| $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all | ||
| $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all | ||
| - name: build w/o tests | ||
| run: | | ||
| $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all | ||
| - name: build | ||
| run: | | ||
| $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always | ||
| - name: cabal check | ||
| run: | | ||
| cd ${PKGDIR_connexpay} || false | ||
| ${CABAL} -vnormal check | ||
| cd ${PKGDIR_connexpay_optparse} || false | ||
| ${CABAL} -vnormal check | ||
| - name: haddock | ||
| run: | | ||
| $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all | ||
| - name: unconstrained build | ||
| run: | | ||
| rm -f cabal.project.local | ||
| $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all | ||
| - name: save cache | ||
| if: always() | ||
| uses: actions/cache/save@v4 | ||
| with: | ||
| key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} | ||
| path: ~/.cabal/store |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # https://github.com/github/gitignore/blob/main/Haskell.gitignore | ||
| dist | ||
| dist-* | ||
| cabal-dev | ||
| *.o | ||
| *.hi | ||
| *.hie | ||
| *.chi | ||
| *.chs.h | ||
| *.dyn_o | ||
| *.dyn_hi | ||
| .hpc | ||
| .hsenv | ||
| .cabal-sandbox/ | ||
| cabal.sandbox.config | ||
| *.prof | ||
| *.aux | ||
| *.hp | ||
| *.eventlog | ||
| .stack-work/ | ||
| cabal.project.local | ||
| cabal.project.local~ | ||
| .HTF/ | ||
|
|
||
| stack.yaml.lock | ||
|
|
||
| # Temp files | ||
| *~ | ||
| \#*\# |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| branches: master |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| with-compiler: ghc-9.6.6 | ||
|
|
||
| packages: | ||
| connexpay/ | ||
| connexpay-optparse/ | ||
|
|
||
| source-repository-package | ||
| type: git | ||
| location: https://github.com/typeable/bucks.git | ||
| tag: 9e378b675fe7fb88d5ddb3af068d82eb441f343c | ||
|
|
||
| source-repository-package | ||
| type: git | ||
| location: https://github.com/typeable/req.git | ||
| tag: 8829ac5197f7a4b3f04b7fdfc3ea66cfe70ab0a5 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you just copy it from air? Most of these aren't necessary here. Also this is an open source repo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup. Just copied from Air.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uff... I was unaware of that fact. So are we at a stage to be keen on backwards compatibility and similar?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tidied up: e1bd8c9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No I'm just saying leaking stuff like filenames or jira numbers might not be a good idea