release 1.7.3 #2132
There are no files selected for viewing
This file contains 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
This file contains 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 |
|---|---|---|
|
|
@@ -6,79 +6,144 @@ | |
| # | ||
| # haskell-ci regenerate | ||
| # | ||
| # For more information, see https://github.com/andreasabel/haskell-ci | ||
|
There was a problem hiding this comment. Could you explain why we're switching to your own fork? Have to confess I'm a bit reluctant to, unless strictly necessarily. If it necessary, then documentation as to the reason should be added here. There was a problem hiding this comment. My fork uses the There was a problem hiding this comment. And why do we need the latest version of There was a problem hiding this comment. Not needed. If it matters to you, I can install the original haskell-ci and recreate this workflow. But this is anyway just customary CI for 1.7.3 which won't end up in master. There was a problem hiding this comment. Yes, I guess that's my real question! Why are we trying to make a custom CI pass for v1.7.3? There was a problem hiding this comment. I don't want to release without having run CI. But I now I am passing the bucket to you, so I make #2141 without CI changes. |
||
| # | ||
| # version: 0.17.20231002 | ||
| # | ||
| # REGENDATA ("0.17.20231002",["github","--no-cabal-check","agda-stdlib-utils.cabal"]) | ||
| # | ||
| name: Haskell-CI | ||
| on: | ||
| - push | ||
| - pull_request | ||
| jobs: | ||
| linux: | ||
| name: Haskell-CI - Linux - ${{ matrix.compiler }} | ||
| runs-on: ubuntu-20.04 | ||
| timeout-minutes: | ||
| 60 | ||
| container: | ||
| image: buildpack-deps:focal | ||
| continue-on-error: ${{ matrix.allow-failure }} | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - compiler: ghc-9.8.0.20230929 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.8.0.20230929 | ||
| setup-method: ghcup | ||
| allow-failure: true | ||
| - compiler: ghc-9.6.3 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.6.3 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-9.4.7 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.4.7 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-9.2.8 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.2.8 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-9.0.2 | ||
| compilerKind: ghc | ||
| compilerVersion: 9.0.2 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-8.10.7 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.10.7 | ||
| setup-method: ghcup | ||
| allow-failure: false | ||
| - compiler: ghc-8.8.4 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.8.4 | ||
| setup-method: hvr-ppa | ||
| allow-failure: false | ||
| - compiler: ghc-8.6.5 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.6.5 | ||
| setup-method: hvr-ppa | ||
| allow-failure: false | ||
| - compiler: ghc-8.4.4 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.4.4 | ||
| setup-method: hvr-ppa | ||
| allow-failure: false | ||
| - compiler: ghc-8.2.2 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.2.2 | ||
| setup-method: hvr-ppa | ||
| allow-failure: false | ||
| - compiler: ghc-8.0.2 | ||
| compilerKind: ghc | ||
| compilerVersion: 8.0.2 | ||
| setup-method: hvr-ppa | ||
| allow-failure: false | ||
| fail-fast: false | ||
| steps: | ||
| - name: apt | ||
| run: | | ||
| apt-get update | ||
| apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 | ||
| if [ "${{ matrix.setup-method }}" = ghcup ]; then | ||
| mkdir -p "$HOME/.ghcup/bin" | ||
| curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" | ||
| chmod a+x "$HOME/.ghcup/bin/ghcup" | ||
| "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; | ||
| "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) | ||
| "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) | ||
| else | ||
| apt-add-repository -y 'ppa:hvr/ghc' | ||
| apt-get update | ||
| apt-get install -y "$HCNAME" | ||
| mkdir -p "$HOME/.ghcup/bin" | ||
| curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" | ||
| chmod a+x "$HOME/.ghcup/bin/ghcup" | ||
| "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; | ||
| "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) | ||
| fi | ||
| 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" | ||
| HCDIR=/opt/$HCKIND/$HCVER | ||
| if [ "${{ matrix.setup-method }}" = ghcup ]; then | ||
| 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" | ||
| echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" | ||
| else | ||
| HC=$HCDIR/bin/$HCKIND | ||
| echo "HC=$HC" >> "$GITHUB_ENV" | ||
| echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" | ||
| echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" | ||
| echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" | ||
| fi | ||
|
|
||
| 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" | ||
| if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi | ||
| echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" | ||
| echo "GHCJSARITH=0" >> "$GITHUB_ENV" | ||
| env: | ||
| HCKIND: ${{ matrix.compilerKind }} | ||
| HCNAME: ${{ matrix.compiler }} | ||
| HCVER: ${{ matrix.compilerVersion }} | ||
| - name: env | ||
| run: | | ||
| env | ||
|
|
@@ -101,6 +166,22 @@ jobs: | |
| repository hackage.haskell.org | ||
| url: http://hackage.haskell.org/ | ||
| EOF | ||
| if $HEADHACKAGE; then | ||
| cat >> $CABAL_CONFIG <<EOF | ||
| repository head.hackage.ghc.haskell.org | ||
| url: https://ghc.gitlab.haskell.org/head.hackage/ | ||
| secure: True | ||
| root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d | ||
| 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329 | ||
| f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89 | ||
| key-threshold: 3 | ||
| active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override | ||
| EOF | ||
| fi | ||
| cat >> $CABAL_CONFIG <<EOF | ||
| program-default-options | ||
| ghc-options: $GHCJOBS +RTS -M3G -RTS | ||
| EOF | ||
| cat $CABAL_CONFIG | ||
| - name: versions | ||
| run: | | ||
|
|
@@ -113,14 +194,14 @@ jobs: | |
| - 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 | ||
|
|
@@ -139,23 +220,27 @@ jobs: | |
| - name: generate cabal.project | ||
| run: | | ||
| PKGDIR_agda_stdlib_utils="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/agda-stdlib-utils-[0-9.]*')" | ||
| echo "PKGDIR_agda_stdlib_utils=${PKGDIR_agda_stdlib_utils}" >> "$GITHUB_ENV" | ||
| rm -f cabal.project cabal.project.local | ||
| touch cabal.project | ||
| touch cabal.project.local | ||
| echo "packages: ${PKGDIR_agda_stdlib_utils}" >> cabal.project | ||
| if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi | ||
| if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi | ||
| cat >> cabal.project <<EOF | ||
| EOF | ||
| if $HEADHACKAGE; then | ||
| echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project | ||
| fi | ||
| $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(agda-stdlib-utils)$/; }' >> 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@v3 | ||
| with: | ||
| key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} | ||
| path: ~/.cabal/store | ||
|
|
@@ -170,7 +255,16 @@ jobs: | |
| - name: build | ||
| run: | | ||
| $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always | ||
| - 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 | ||
| uses: actions/cache/save@v3 | ||
| if: always() | ||
| with: | ||
| key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} | ||
| path: ~/.cabal/store | ||
This file contains 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 |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| Version 1.7.3 | ||
| ============= | ||
|
|
||
| The library has been tested using Agda 2.6.4. | ||
|
|
||
| * To avoid _large indices_ that are by default no longer allowed in Agda 2.6.4, | ||
| universe levels have been increased in the following definitions: | ||
| - `Data.Star.Decoration.DecoratedWith` | ||
| - `Data.Star.Pointer.Pointer` | ||
| - `Reflection.AnnotatedAST.Typeₐ` | ||
| - `Reflection.AnnotatedAST.AnnotationFun` |
Oops, something went wrong.
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.
So I imagine that we'd be merging this branch back into
masterat some point. While a lot of the changes to this CI file are enhancements (e.g. bumping versions), can we avoid removing functionality like this?In particular it's important that if we're on the experimental branch, we install a different version of Agda!
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.
Oh, apologies, I didn't know this would be merged back into master.
What are the reasons for merging it in there?
masteralready contains the relevant patch to remove the use of large indices (I cherry-picked it from there).E.g. for the release of Agda-2.6.4, I am not merging the release branch back in. It only contains changes that are relevant for the release. The tag
v2.6.4will sit on some leaf three commits away from the trunk. Is there a problem with this approach I have chosen?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.
Well on principle, I don't think we should be making any changes that we don't want to merge back across. Furthermore you're making various improvements to the CI for example right? Bumping versions etc. it would nice if those were added back across. I guess we can cherry-pick them...
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.
The versions are already bumped in
master, the last CI bumps are in: