Skip to content

Commit 8c56003

Browse files
committed
check.sh: revert to curator tag and move check.sh to build-constraints/etc/check-lts.sh
1 parent 97485eb commit 8c56003

File tree

3 files changed

+4
-32
lines changed

3 files changed

+4
-32
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
key: ${{ runner.os }}-stackage-nightly-${{ hashFiles('**/build-constraints.yaml') }}
2222
restore-keys: |
2323
${{ runner.os }}-
24-
- run: etc/check.sh
24+
- run: build-constraints/etc/check-lts.sh

build-constraints/etc/check-lts.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,18 @@
33
set -euxo pipefail
44

55
ETC=$(cd $(dirname $0) ; pwd)
6-
export GHCVER=$(sed -n "s/^ghc-version: \"\(.*\)\"/\1/p" "$ETC/../build-constraints.yaml")
6+
export GHCVER=$(sed -n "s/^ghc-version: \"\(.*\)\"/\1/p" "$ETC/../build-constraints/lts-23-build-constraints.yaml")
77

88
# Download and unpack the stack executable
99
mkdir -p ~/.local/bin
1010
export PATH=$HOME/.local/bin:$PATH
1111
curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
1212

1313
# Get new Stackage curator
14-
curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-62d4bce549af5fccb5089b8aa319891dbe032ccb/curator.bz2" | bunzip2 > curator
14+
curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-6689440033b12182c0853bdd23880a84849eb6b2/curator.bz2" | bunzip2 > curator
1515
chmod +x curator
1616

1717
# Install GHC
1818
stack setup $GHCVER
1919

20-
# curator's constraint command has target as a required parameter
21-
# because of a different constraints handling in minor LTS version bumps
22-
NIGHTLY="nightly-$(date +%Y-%m-%d)"
23-
# New curator check
24-
./curator update &&
25-
./curator constraints --target=$NIGHTLY &&
26-
./curator snapshot-incomplete --target=$NIGHTLY &&
27-
./curator snapshot &&
28-
stack --resolver ghc-$GHCVER exec ./curator check-snapshot
20+
./build-constraints/check-lts

etc/check.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)