Skip to content

Commit

Permalink
20241210 dependency update (#24)
Browse files Browse the repository at this point in the history
* flake.lock: Update

Flake lock file updates:

• Updated input 'bellroy-nix-foss':
    'github:bellroy/bellroy-nix-foss/bc3fc6f92c9ae1969a98696a95acb53052aefd45' (2024-10-15)
  → 'github:bellroy/bellroy-nix-foss/9758ab8a249a695cc1a5fe686b6a66d5f50319d8' (2024-12-10)
• Updated input 'bellroy-nix-foss/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Removed input 'bellroy-nix-foss/haskell-ci'
• Updated input 'bellroy-nix-foss/nixpkgs':
    'github:NixOS/nixpkgs/b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221' (2024-10-10)
  → 'github:NixOS/nixpkgs/dd51f52372a20a93c219e8216fe528a648ffcbf4' (2024-12-08)
• Updated input 'bellroy-nix-foss/pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/ff68f91754be6f3427e4986d7949e6273659be1d' (2024-10-13)
  → 'github:cachix/pre-commit-hooks.nix/d8c02f0ffef0ef39f6063731fc539d8c71eb463a' (2024-12-08)
• Updated input 'bellroy-nix-foss/pre-commit-hooks/nixpkgs-stable':
    'github:NixOS/nixpkgs/194846768975b7ad2c4988bdb82572c00222c0d7' (2024-07-07)
  → 'github:NixOS/nixpkgs/d063c1dd113c91ab27959ba540c0d9753409edf3' (2024-11-04)

* Use get-tested instead of haskell-ci

* Update outdated referecnes
  • Loading branch information
michaelwebb76 authored Dec 11, 2024
1 parent 2cfe9f5 commit 10109f8
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 95 deletions.
112 changes: 49 additions & 63 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,28 @@
# This GitHub workflow config has been generated by a script via
#
# haskell-ci 'github' 'cached-io.cabal'
#
# To regenerate the script (for example after adjusting tested-with) run
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20240708
#
# REGENDATA ("0.19.20240708",["github","cached-io.cabal"])
#
name: Haskell-CI
name: Haskell CI
on:
- push
- pull_request
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
generate-matrix:
name: "Generate matrix from cabal"
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
runs-on: ubuntu-20.04
timeout-minutes:
60
steps:
- name: Extract the tested GHC versions
id: set-matrix
uses: kleidukos/get-tested@a0aa3f2d4ab0d10daa49dc9ee8c706d673fb0e02
with:
cabal-file: cached-io.cabal
ubuntu-version: "20.04"
version: 0.1.7.1
tests:
name: ${{ matrix.ghc }} on ${{ matrix.os }}
needs: generate-matrix
runs-on: ${{ matrix.os }}
container:
image: buildpack-deps:jammy
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.6
compilerKind: ghc
compilerVersion: 9.6.6
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.5
compilerKind: ghc
compilerVersion: 9.4.5
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.4
compilerKind: ghc
compilerVersion: 9.2.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.0.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.10.7
compilerKind: ghc
compilerVersion: 8.10.7
setup-method: ghcup
allow-failure: false
fail-fast: false
matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
steps:
- name: apt
run: |
Expand All @@ -70,9 +34,9 @@ jobs:
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
HCKIND: ghc
HCNAME: ghc-${{ matrix.ghc }}
HCVER: ${{ matrix.ghc }}
- name: Set PATH and environment variables
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
Expand All @@ -95,9 +59,9 @@ jobs:
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
HCVER: ${{ matrix.compilerVersion }}
HCKIND: ghc
HCNAME: ghc-${{ matrix.ghc }}
HCVER: ${{ matrix.ghc }}
- name: env
run: |
env
Expand Down Expand Up @@ -133,6 +97,11 @@ jobs:
- name: update cabal index
run: |
$CABAL v2-update -v
- name: cache (tools)
uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1
path: ~/.haskell-ci-tools
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
Expand All @@ -142,6 +111,16 @@ jobs:
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: install doctest
run: |
$CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22.0'
doctest --version
- name: save cache (tools)
uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1
path: ~/.haskell-ci-tools
- name: checkout
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -181,9 +160,9 @@ jobs:
- name: restore cache
uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
path: ~/.cabal/store
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
- name: install dependencies
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
Expand All @@ -194,6 +173,13 @@ jobs:
- name: build
run: |
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
- name: tests
run: |
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: doctest
run: |
cd ${PKGDIR_cached_io} || false
doctest -XHaskell2010 src
- name: cabal check
run: |
cd ${PKGDIR_cached_io} || false
Expand All @@ -209,5 +195,5 @@ jobs:
uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
path: ~/.cabal/store
47 changes: 15 additions & 32 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 10109f8

Please sign in to comment.