diff options
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release-candidate.yml | 5 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 83e2c8ca9..f023ca671 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,7 @@ task: trigger_type: manual timeout_in: 90m arm_container: - image: glcr.b-data.ch/ghc/ghc-musl:9.2.8 + image: glcr.b-data.ch/ghc/ghc-musl:9.6 cpu: 4 memory: 12G env: @@ -53,7 +53,7 @@ task: trigger_type: manual timeout_in: 90m container: - image: glcr.b-data.ch/ghc/ghc-musl:9.2.8 + image: glcr.b-data.ch/ghc/ghc-musl:9.6 cpu: 4 memory: 12G env: diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 0fba6ac03..0dda2f2a8 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -21,8 +21,7 @@ jobs: - uses: actions/checkout@v3 - name: Install ghc run: | - # We use ghc 9.2 because of #8955 - ghcup install ghc --set 9.2 + ghcup install ghc --set 9.6 ghcup install cabal --set 3.10 - name: Install dependencies @@ -85,7 +84,7 @@ jobs: - name: Install ghc and cabal run: | - ghcup install ghc --set 9.4 + ghcup install ghc --set 9.6 ghcup install cabal --set 3.10 - name: Create release @@ -2,7 +2,7 @@ version?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}') pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1) SOURCEFILES?=$(shell git ls-tree -r main --name-only src pandoc-cli pandoc-server pandoc-lua-engine | grep "\.hs$$") PANDOCSOURCEFILES?=$(shell git ls-tree -r main --name-only src | grep "\.hs$$") -DOCKERIMAGE=glcr.b-data.ch/ghc/ghc-musl:9.2.8 +DOCKERIMAGE=glcr.b-data.ch/ghc/ghc-musl:9.6 TIMESTAMP=$(shell date "+%Y%m%d_%H%M") LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null)) BASELINE?=$(LATESTBENCH) |