mirror of
https://github.com/xmonad/xmonad.git
synced 2025-05-19 08:30:21 -07:00
ci: Regenerate haskell-ci
This commit is contained in:
parent
21cc6ebd93
commit
8e820945f4
16
.github/workflows/haskell-ci.yml
vendored
16
.github/workflows/haskell-ci.yml
vendored
@ -8,9 +8,9 @@
|
|||||||
#
|
#
|
||||||
# For more information, see https://github.com/haskell-CI/haskell-ci
|
# For more information, see https://github.com/haskell-CI/haskell-ci
|
||||||
#
|
#
|
||||||
# version: 0.16.6
|
# version: 0.17.20231010
|
||||||
#
|
#
|
||||||
# REGENDATA ("0.16.6",["github","cabal.project"])
|
# REGENDATA ("0.17.20231010",["github","cabal.project"])
|
||||||
#
|
#
|
||||||
name: Haskell-CI
|
name: Haskell-CI
|
||||||
on:
|
on:
|
||||||
@ -79,7 +79,7 @@ jobs:
|
|||||||
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
|
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
|
||||||
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
||||||
mkdir -p "$HOME/.ghcup/bin"
|
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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
|
||||||
chmod a+x "$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 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.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
|
||||||
@ -90,7 +90,7 @@ jobs:
|
|||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y "$HCNAME" libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev
|
apt-get install -y "$HCNAME" libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev
|
||||||
mkdir -p "$HOME/.ghcup/bin"
|
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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
|
||||||
chmod a+x "$HOME/.ghcup/bin/ghcup"
|
chmod a+x "$HOME/.ghcup/bin/ghcup"
|
||||||
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
|
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
|
||||||
fi
|
fi
|
||||||
@ -106,10 +106,12 @@ jobs:
|
|||||||
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
|
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
|
||||||
HCDIR=/opt/$HCKIND/$HCVER
|
HCDIR=/opt/$HCKIND/$HCVER
|
||||||
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
if [ "${{ matrix.setup-method }}" = ghcup ]; then
|
||||||
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 "HC=$HC" >> "$GITHUB_ENV"
|
||||||
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
|
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
|
||||||
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
|
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
|
||||||
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
|
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
|
||||||
else
|
else
|
||||||
HC=$HCDIR/bin/$HCKIND
|
HC=$HCDIR/bin/$HCKIND
|
||||||
|
Loading…
x
Reference in New Issue
Block a user