diff options
| author | John MacFarlane <[email protected]> | 2025-12-11 23:07:06 +0100 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2025-12-11 23:07:06 +0100 |
| commit | eea72420fcd0c5d30c4359b03650040fc38380b4 (patch) | |
| tree | 0c27b79c109639c9a3c9aff7c074914904759e7e | |
| parent | ab212c7b87828902c4a5c8d09d43942f9179d992 (diff) | |
Use ghc 9.10 (not 9.12) for releases and nightlies.
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/release-candidate.yml | 8 | ||||
| -rw-r--r-- | Makefile | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 616d853ee..0c77c9c3f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,9 +7,9 @@ task: image: ghcr.io/cirruslabs/macos-monterey-base:latest brew_script: - brew update - - brew install [email protected] cabal-install + - brew install [email protected] cabal-install env: - PATH: /opt/homebrew/opt/[email protected]/bin:${PATH} + PATH: /opt/homebrew/opt/[email protected]/bin:${PATH} cabal_store_cache: folder: ~/.cabal/store fingerprint_key: macos_2023_03_12 @@ -29,7 +29,7 @@ task: trigger_type: manual timeout_in: 90m arm_container: - image: quay.io/benz0li/ghc-musl:9.12 + image: quay.io/benz0li/ghc-musl:9.10 cpu: 4 memory: 12G env: @@ -55,7 +55,7 @@ task: trigger_type: manual timeout_in: 90m container: - image: quay.io/benz0li/ghc-musl:9.12 + image: quay.io/benz0li/ghc-musl:9.10 cpu: 4 memory: 12G env: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e61c2f779..33d3b2e87 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,7 +17,7 @@ jobs: - name: Install ghc run: | - ghcup install ghc --set 9.12 + ghcup install ghc --set 9.10 ghcup install cabal --set 3.14 - name: Install dependencies @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v6 - name: Install ghc run: | - ghcup install ghc --set 9.12 + ghcup install ghc --set 9.10 ghcup install cabal --set 3.14 - name: Install dependencies run: | @@ -80,7 +80,7 @@ jobs: brew install ghcup - name: Install ghc run: | - ghcup install ghc --set 9.12 + ghcup install ghc --set 9.10 ghcup install cabal --set 3.14 echo "$HOME/.ghcup/bin" >> "${GITHUB_PATH}" - name: Install dependencies diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 6ece2ac61..6d437681c 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -21,8 +21,8 @@ jobs: - uses: actions/checkout@v6 - name: Install ghc run: | - ghcup install ghc --set 9.12 - ghcup install cabal --set 3.12 + ghcup install ghc --set 9.10 + ghcup install cabal --set 3.14 - name: Install dependencies run: | @@ -88,8 +88,8 @@ jobs: - name: Install ghc and cabal run: | - ghcup install ghc --set 9.12 - ghcup install cabal --set 3.12 + ghcup install ghc --set 9.10 + ghcup install cabal --set 3.14 echo "$HOME/.ghcup/bin" >> "${GITHUB_PATH}" - name: Create release @@ -2,7 +2,7 @@ VERSION?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}') PANDOC_CLI_VERSION?=$(shell grep '^[Vv]ersion:' pandoc-cli/pandoc-cli.cabal | awk '{print $$2;}') 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=quay.io/benz0li/ghc-musl:9.8 +DOCKERIMAGE=quay.io/benz0li/ghc-musl:9.10 TIMESTAMP=$(shell date "+%Y%m%d_%H%M") LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null)) BASELINE?=$(LATESTBENCH) |