From 609324f1befd61b9801d9631cc20b14686106437 Mon Sep 17 00:00:00 2001 From: Li-yao Xia Date: Tue, 27 Feb 2024 10:00:07 +0100 Subject: [PATCH 1/2] ci: Use haskell-actions/setup (moved from haskell/actions/setup) --- .github/workflows/developer-flag.yml | 2 +- .github/workflows/simdutf-flag-windows.yml | 2 +- .github/workflows/simdutf-flag.yml | 2 +- .github/workflows/windows_and_macOS.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/developer-flag.yml b/.github/workflows/developer-flag.yml index 65404644..236e1eb3 100644 --- a/.github/workflows/developer-flag.yml +++ b/.github/workflows/developer-flag.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} diff --git a/.github/workflows/simdutf-flag-windows.yml b/.github/workflows/simdutf-flag-windows.yml index 8246975d..86e88b31 100644 --- a/.github/workflows/simdutf-flag-windows.yml +++ b/.github/workflows/simdutf-flag-windows.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} diff --git a/.github/workflows/simdutf-flag.yml b/.github/workflows/simdutf-flag.yml index ca970a49..9a4599f5 100644 --- a/.github/workflows/simdutf-flag.yml +++ b/.github/workflows/simdutf-flag.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} diff --git a/.github/workflows/windows_and_macOS.yml b/.github/workflows/windows_and_macOS.yml index 3b826fbe..7a633f77 100644 --- a/.github/workflows/windows_and_macOS.yml +++ b/.github/workflows/windows_and_macOS.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal with: ghc-version: ${{ matrix.ghc }} @@ -29,7 +29,7 @@ jobs: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} key: ${{ runner.os }}-${{ matrix.ghc }} # We rebuild tests several times to avoid intermittent failures on Windows - # https://github.com/haskell/actions/issues/36 + # https://github.com/haskell-actions/issues/36 - name: Test run: | bld() { cabal build pkg:text:tests; } From e4c615dcdb37f2eb1cb55f6d12dbb5beebd2e04f Mon Sep 17 00:00:00 2001 From: Li-yao Xia Date: Tue, 12 Mar 2024 23:19:35 +0100 Subject: [PATCH 2/2] ci: Remove old workaround --- .github/workflows/windows_and_macOS.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/windows_and_macOS.yml b/.github/workflows/windows_and_macOS.yml index 7a633f77..36d4e0fa 100644 --- a/.github/workflows/windows_and_macOS.yml +++ b/.github/workflows/windows_and_macOS.yml @@ -28,12 +28,9 @@ jobs: with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} key: ${{ runner.os }}-${{ matrix.ghc }} - # We rebuild tests several times to avoid intermittent failures on Windows - # https://github.com/haskell-actions/issues/36 - name: Test run: | - bld() { cabal build pkg:text:tests; } - bld || bld || bld + cabal build pkg:text:tests cabal test - name: Haddock run: cabal haddock