Skip to content

Commit

Permalink
feat: dep updates june 2024 (#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/da73621c62c98e375270f8f8a98295a517aa5685' (2024-06-25)
  → 'github:bellroy/bellroy-nix-foss/b6c032e0c9aeb1886538d9db10809bc441dd2bac' (2024-06-25)
• Updated input 'bellroy-nix-foss/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'bellroy-nix-foss/flake-utils':
    'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25)
  → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eef6384e98b48f0c12f8e74a387f4427959f1bdf' (2023-12-11)
  → 'github:nixos/nixpkgs/4c547b66635455ad061d4beecaf1805810dc0428' (2024-06-24)

* feat: add tested with ghc96
  • Loading branch information
Tristano8 authored Jun 25, 2024
1 parent 5712422 commit 15606c7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 23 deletions.
22 changes: 12 additions & 10 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.6
# version: 0.18.1
#
# REGENDATA ("0.16.6",["github","aws-arn.cabal","--hlint","--doctest"])
# REGENDATA ("0.18.1",["github","aws-arn.cabal","--hlint","--doctest"])
#
name: Haskell-CI
on:
Expand Down Expand Up @@ -55,10 +55,10 @@ jobs:
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand All @@ -70,11 +70,13 @@ jobs:
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -124,7 +126,7 @@ jobs:
- name: cache (tools)
uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a7a32ff6
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a7f684fe
path: ~/.haskell-ci-tools
- name: install cabal-plan
run: |
Expand All @@ -149,7 +151,7 @@ jobs:
uses: actions/cache/save@v3
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a7a32ff6
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a7f684fe
path: ~/.haskell-ci-tools
- name: checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion aws-arn.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extra-source-files:
README.md

tested-with:
GHC ==8.10.7 || ==9.0.2 || ==9.2.5 || ==9.4.5
GHC ==8.10.7 || ==9.0.2 || ==9.2.5 || ==9.4.5 || ==9.6.5

common opts
default-language: Haskell2010
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

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

0 comments on commit 15606c7

Please sign in to comment.