From cfd36a7c5406012a955124c7a071654e2c74cb94 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 5 Dec 2022 23:07:35 +0100 Subject: [PATCH 1/5] CI: include GHC 9.4, bump actions to latest version --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68f7aad2..49b1b0f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,14 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, macOS-latest] - ghc: ['9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2'] + ghc: ['9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2'] steps: - - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1 + - uses: actions/checkout@v3 + - uses: haskell/actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 name: Cache cabal stuff with: path: | @@ -50,7 +50,7 @@ jobs: run: | yum install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test run: | source ~/.ghcup/env @@ -69,7 +69,7 @@ jobs: run: | dnf install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test run: | source ~/.ghcup/env @@ -89,7 +89,7 @@ jobs: apt-get update -y apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Test run: | source ~/.ghcup/env @@ -106,8 +106,8 @@ jobs: matrix: arch: ['armv7', 'aarch64'] steps: - - uses: actions/checkout@v2 - - uses: uraimo/run-on-arch-action@v2.1.1 + - uses: actions/checkout@v3 + - uses: uraimo/run-on-arch-action@v2 timeout-minutes: 120 with: arch: ${{ matrix.arch }} From 5a80434f1a89cf8e29de8f14efff0119d93d5426 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 5 Dec 2022 23:23:33 +0100 Subject: [PATCH 2/5] CI: pin ubuntu-20.04, no fail-fast, restrict to master, ci-* --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49b1b0f8..44cbd716 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,9 @@ name: ci on: - - push - - pull_request + push: + branches: [ master, ci-* ] + pull_request: + branches: [ master, ci-* ] defaults: run: @@ -11,9 +13,9 @@ jobs: build: runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false matrix: - os: [ubuntu-latest, macOS-latest] + os: [ubuntu-20.04, macOS-latest] ghc: ['9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2'] steps: - uses: actions/checkout@v3 From adaa1125504e7fd656e2abab8c87d60cb9848528 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 6 Dec 2022 00:53:52 +0100 Subject: [PATCH 3/5] CI i386: stick to v1 of actions/checkout --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44cbd716..068899e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,7 +91,7 @@ jobs: apt-get update -y apt-get install -y autoconf build-essential zlib1g-dev libgmp-dev curl curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - name: Test run: | source ~/.ghcup/env From 21212f29bf26ad2c58dcc2b29f6ae522f60599b7 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 6 Dec 2022 17:55:26 +0100 Subject: [PATCH 4/5] CI: switch matrix to ubuntu-22.04 and install 8.2 prereqs --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 068899e8..4565a63c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macOS-latest] + os: [ubuntu-22.04, macOS-latest] ghc: ['9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2'] steps: - uses: actions/checkout@v3 + - name: Install prerequisites for GHC 8.2 on ubuntu-22.04 + if: runner.os == 'Linux' && matrix.ghc == '8.2' + run: | + sudo apt-get install libncurses5 libtinfo5 - uses: haskell/actions/setup@v2 id: setup-haskell-cabal with: From 91a5c8ff8266c49f2986c0e245607b0b9998c688 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 6 Dec 2022 22:09:19 +0100 Subject: [PATCH 5/5] Revert changes to CI triggers --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4565a63c..e135c07e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,7 @@ name: ci on: - push: - branches: [ master, ci-* ] - pull_request: - branches: [ master, ci-* ] + - push + - pull_request defaults: run: @@ -13,7 +11,7 @@ jobs: build: runs-on: ${{ matrix.os }} strategy: - fail-fast: false + fail-fast: true matrix: os: [ubuntu-22.04, macOS-latest] ghc: ['9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2']