diff options
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/release-candidate.yml | 8 | ||||
| -rw-r--r-- | Makefile | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 20b28d7ba..7fd27a4cc 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.6 + image: quay.io/benz0li/ghc-musl:9.8 cpu: 4 memory: 12G env: @@ -55,7 +55,7 @@ task: trigger_type: manual timeout_in: 90m container: - image: quay.io/benz0li/ghc-musl:9.6 + image: quay.io/benz0li/ghc-musl:9.8 cpu: 4 memory: 12G env: diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index b6227c1ad..584346f85 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -21,8 +21,8 @@ jobs: - uses: actions/checkout@v4 - name: Install ghc run: | - ghcup install ghc --set 9.6 - ghcup install cabal --set 3.10 + ghcup install ghc --set 9.8 + ghcup install cabal --set 3.12 - name: Install dependencies run: | @@ -88,8 +88,8 @@ jobs: - name: Install ghc and cabal run: | - ghcup install ghc --set 9.6 - ghcup install cabal --set 3.10 + ghcup install ghc --set 9.8 + ghcup install cabal --set 3.12 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.6 +DOCKERIMAGE=quay.io/benz0li/ghc-musl:9.8 TIMESTAMP=$(shell date "+%Y%m%d_%H%M") LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null)) BASELINE?=$(LATESTBENCH) |