Skip to content

Commit

Permalink
Merge pull request #44 from SamirTalwar/debug-broken-build
Browse files Browse the repository at this point in the history
  • Loading branch information
SamirTalwar authored Aug 15, 2020
2 parents b72739c + 8873e18 commit a0e0be1
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 18 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ jobs:
- run: nix-instantiate shell.nix | cachix push samirtalwar
env:
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
- uses: actions/cache@v2
with:
path: ~/.stack
key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
restore-keys: v1-${{ matrix.os }}-stack-
# - uses: actions/cache@v2
# with:
# path: ~/.stack
# key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
- uses: actions/download-artifact@v1
with:
name: release_upload_url
Expand All @@ -61,7 +60,7 @@ jobs:
export ASSET_NAME="smoke-${TAG##*/}-$(uname -s)-$(uname -m)"
echo ::set-output name=asset_name::"$ASSET_NAME"
echo ::set-output name=asset_path::"out/publish/${ASSET_NAME}"
- run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'cabal --enable-nix v2-update'
- run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'make smoke.cabal'
- run: nix-shell --pure --keep LANG ./nix/ci.nix --run 'make out/build/release/smoke'
- run: |
mkdir -p "$(dirname ${{ steps.asset.outputs.asset_path }})"
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ jobs:
fi
env:
CACHIX_SIGNING_KEY: ${{ secrets.CACHIX_SIGNING_KEY }}
- uses: actions/cache@v2
with:
path: ~/.stack
key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
restore-keys: v1-${{ matrix.os }}-stack-
# - uses: actions/cache@v2
# with:
# path: ~/.stack
# key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
- run: |
mkdir -p ~/.stack
cat > ~/.stack/config.yaml <<EOF
Expand All @@ -58,11 +57,10 @@ jobs:
- uses: cachix/cachix-action@v6
with:
name: samirtalwar
- uses: actions/cache@v2
with:
path: ~/.stack
key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
restore-keys: v1-${{ matrix.os }}-stack-
# - uses: actions/cache@v2
# with:
# path: ~/.stack
# key: v1-${{ matrix.os }}-stack-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}
- run: |
mkdir -p ~/.stack
cat > ~/.stack/config.yaml <<EOF
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ out
# Stack
/.stack-work
*.cabal
stack.yaml.lock
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-16.8
resolver: lts-16.9
packages:
- .
ghc-options:
Expand Down
12 changes: 12 additions & 0 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# This file was autogenerated by Stack.
# You should not edit this file by hand.
# For more information, please see the documentation at:
# https://docs.haskellstack.org/en/stable/lock_files

packages: []
snapshots:
- completed:
size: 532380
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/9.yaml
sha256: 14a7cec114424e4286adde73364438927a553ed248cc50f069a30a67e3ee1e69
original: lts-16.9

0 comments on commit a0e0be1

Please sign in to comment.