From 4dc0c772ccb0351578d9a59d3d2d934b0965389f Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 10:30:03 +0900 Subject: [PATCH 01/10] fix(ci): bumps up `actions/*-artifacts` to v4 (fixes https://github.com/advisories/GHSA-6q32-hq47-5qq3) --- .github/workflows/haskell.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 044db4e..22448ed 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -134,7 +134,7 @@ jobs: echo "COPYING: $(basename "${FILE}") (${FILE})" cp "${FILE}" "${{env.bin-artifacts}}/" done - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 name: Upload Binary Artifacts with: name: bins-${{ runner.os }} @@ -156,7 +156,7 @@ jobs: runs-on: ${{ matrix.os }}-latest steps: - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 id: download with: name: bins-${{ runner.os }} @@ -219,7 +219,7 @@ jobs: uses: actions/checkout@v3 - name: Download Artifact(s) id: download - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: ${{ github.workspace }}/artifacts - name: Check Version From 01c87d7e0a788ee4317ae53572c7b8e0523a6e81 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 13:16:30 +0900 Subject: [PATCH 02/10] ci: bumps up to latest stack --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 22448ed..ed7f836 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -173,7 +173,7 @@ jobs: with: ghc-version: 9.6.4 cabal-version: 3.10.2.1 - stack-version: 2.9.3 + stack-version: 2.15.7 - run: cabal v2-update 'hackage.haskell.org,2023-02-13T02:00:06Z' - name: Installs test tool dependencies run: | From 32c7af89cd217a3efd2699328630db01357d1540 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 13:28:52 +0900 Subject: [PATCH 03/10] debug(ci): stop redirecting stderr --- data/only-stack/dependency-domains-stack-dot.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/only-stack/dependency-domains-stack-dot.yaml b/data/only-stack/dependency-domains-stack-dot.yaml index 8efceb0..344bdd5 100644 --- a/data/only-stack/dependency-domains-stack-dot.yaml +++ b/data/only-stack/dependency-domains-stack-dot.yaml @@ -20,4 +20,4 @@ components: custom: shell: | - stack dot --no-external --no-include-base 2>/dev/null + stack dot --no-external --no-include-base From 33ca9c18026600cf981b410534bc51c23a9b015d Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 13:39:05 +0900 Subject: [PATCH 04/10] ci: adds ~/ghcup/bin to PATH as well --- .github/workflows/haskell.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index ed7f836..2218c33 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -180,6 +180,7 @@ jobs: cabal install graphmod mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> "${GITHUB_PATH}" + echo "${HOME}/.ghcup/bin" >> "${GITHUB_PATH}" - name: Intall cabal-plan (Linux) if: ${{ matrix.os == 'ubuntu' }} run: | From c5c68e2778be180e58b5c25f7074bb9214981ad7 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 13:48:48 +0900 Subject: [PATCH 05/10] debug(ci): trying to locate stack --- .github/workflows/haskell.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 2218c33..6474c52 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -184,6 +184,9 @@ jobs: - name: Intall cabal-plan (Linux) if: ${{ matrix.os == 'ubuntu' }} run: | + ls -R "${HOME}/.ghcup" + ls -R "${HOME}/.local" + which stack curl --location 'https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz' | unxz > ~/.local/bin/cabal-plan chmod +x ~/.local/bin/cabal-plan - name: Run tests From ba7094f26800b0b850ea5ccaf13bd1b20f1baba5 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 13:57:06 +0900 Subject: [PATCH 06/10] fix(ci): moves inspection to independent step --- .github/workflows/haskell.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 6474c52..a015a30 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -181,12 +181,17 @@ jobs: mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> "${GITHUB_PATH}" echo "${HOME}/.ghcup/bin" >> "${GITHUB_PATH}" - - name: Intall cabal-plan (Linux) - if: ${{ matrix.os == 'ubuntu' }} + - name: Inspect environments (macOS) + if: ${{ matrix.os == 'macOS' }} run: | + echo "PATH=${PATH}" ls -R "${HOME}/.ghcup" ls -R "${HOME}/.local" which stack + stack --version + - name: Intall cabal-plan (Linux) + if: ${{ matrix.os == 'ubuntu' }} + run: | curl --location 'https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz' | unxz > ~/.local/bin/cabal-plan chmod +x ~/.local/bin/cabal-plan - name: Run tests From 5d4387c2267c3a91db2bd947a4bf9ad26ff429f9 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 14:05:12 +0900 Subject: [PATCH 07/10] ci: explicitly installs stack --- .github/workflows/haskell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index a015a30..9e78eab 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -181,9 +181,10 @@ jobs: mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> "${GITHUB_PATH}" echo "${HOME}/.ghcup/bin" >> "${GITHUB_PATH}" - - name: Inspect environments (macOS) + - name: Install Stack and Inspect environments (macOS) if: ${{ matrix.os == 'macOS' }} run: | + ghcup install stack 2.15.7 echo "PATH=${PATH}" ls -R "${HOME}/.ghcup" ls -R "${HOME}/.local" From 4aa4e4b91616bf9f953a53450a7624edbf225eff Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 14:18:49 +0900 Subject: [PATCH 08/10] ci: explicitly specifies `enable-stack` --- .github/workflows/haskell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 9e78eab..83d49ec 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -174,6 +174,7 @@ jobs: ghc-version: 9.6.4 cabal-version: 3.10.2.1 stack-version: 2.15.7 + enable-stack: true - run: cabal v2-update 'hackage.haskell.org,2023-02-13T02:00:06Z' - name: Installs test tool dependencies run: | @@ -181,10 +182,9 @@ jobs: mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> "${GITHUB_PATH}" echo "${HOME}/.ghcup/bin" >> "${GITHUB_PATH}" - - name: Install Stack and Inspect environments (macOS) + - name: Inspect environments (macOS) if: ${{ matrix.os == 'macOS' }} run: | - ghcup install stack 2.15.7 echo "PATH=${PATH}" ls -R "${HOME}/.ghcup" ls -R "${HOME}/.local" From bee851364156dc7d752b1cc8f9fe70503befd9d5 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 14:26:54 +0900 Subject: [PATCH 09/10] ci: drops inspection step --- .github/workflows/haskell.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 83d49ec..db3497a 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -182,14 +182,6 @@ jobs: mkdir -p ~/.local/bin echo "${HOME}/.local/bin" >> "${GITHUB_PATH}" echo "${HOME}/.ghcup/bin" >> "${GITHUB_PATH}" - - name: Inspect environments (macOS) - if: ${{ matrix.os == 'macOS' }} - run: | - echo "PATH=${PATH}" - ls -R "${HOME}/.ghcup" - ls -R "${HOME}/.local" - which stack - stack --version - name: Intall cabal-plan (Linux) if: ${{ matrix.os == 'ubuntu' }} run: | From d02b151164b1eeff3a856e665e8316c17eb1b784 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 4 Sep 2024 14:28:12 +0900 Subject: [PATCH 10/10] ci: switched back to stack 2.13 --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index db3497a..ea60636 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -173,7 +173,7 @@ jobs: with: ghc-version: 9.6.4 cabal-version: 3.10.2.1 - stack-version: 2.15.7 + stack-version: 2.13.1 enable-stack: true - run: cabal v2-update 'hackage.haskell.org,2023-02-13T02:00:06Z' - name: Installs test tool dependencies