Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency: deps/haskell-backend_release #235

Merged
merged 6 commits into from
Jul 14, 2023
Merged

Update dependency: deps/haskell-backend_release #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b82a2b
deps/haskell-backend_release: Set Version 2e33122cd354045da4e5f40dea9…
Jul 14, 2023
b2dac3b
call update script within nix
jberthold Jul 14, 2023
11e671f
run stack and cabal natively, providing the correct ghc
jberthold Jul 14, 2023
5b9528f
set up system GHC for stack, update cabal index
jberthold Jul 14, 2023
24c89ad
manually update cabal package list
jberthold Jul 14, 2023
6ca0571
update haskell-backend to version 2e33122cd354045da4e5f40dea9344e02c6…
Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/workflows/update-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
ghc_version: "9.2.8"
stack_version: "2.9.3"

jobs:

nix-flake-submodule-sync:
Expand Down Expand Up @@ -39,6 +43,15 @@ jobs:
name: k-framework
authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}'

- uses: haskell/actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ env.ghc_version }}
Comment on lines +46 to +49
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cabal freeze command was previously picking up the newer ghc from the runner installation (which brought a base library newer than our requested one). I tried running it under a nix shell but with the same result.
The Haskell installation takes some time and we need to manually change the GHC version when we upgrade but we would anyway want to do that IMHO

stack-version: ${{ env.stack_version }}
enable-stack: true
stack-setup-ghc: true
cabal-update: true

- name: 'Update Nix flake from haskell backend release tag'
run: |
set -euxo pipefail
Expand All @@ -53,6 +66,7 @@ jobs:
fi

if ${changed}; then
cabal update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDK why this is necessary... but without it, the cabal freeze call would not find any hackage-supplied packages (only the co-log that we request explicitly in the cabal.project would be available). 🤷‍♂️

scripts/update-haskell-backend.sh ${haskell_backend_version}
git add flake.lock stack.yaml cabal.project cabal.project.freeze
git commit -m "update haskell-backend to version ${haskell_backend_version}"
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/runtimeverification/haskell-backend.git
tag: a6230144a37ee9ebf0f6dffc849faf5ce10df380
--sha256: sha256-XLJQnk/QKmcnqM7gWaY1v7Pw5Xx+A2HmZWS5vYCQ5hE=
tag: 2e33122cd354045da4e5f40dea9344e02c673a64
--sha256: sha256-O3cmhLpIYJXSmfAc8fDAvApAmNnosQ08Yexpx1kiTBw=
subdir: kore kore-rpc-types

2 changes: 1 addition & 1 deletion deps/haskell-backend_release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6230144a37ee9ebf0f6dffc849faf5ce10df380
2e33122cd354045da4e5f40dea9344e02c673a64
113 changes: 23 additions & 90 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
k-framework.url = "github:runtimeverification/k/v5.6.131";
haskell-backend.url = "github:runtimeverification/haskell-backend/a6230144a37ee9ebf0f6dffc849faf5ce10df380";
haskell-backend.url = "github:runtimeverification/haskell-backend/2e33122cd354045da4e5f40dea9344e02c673a64";
k-framework.inputs.booster-backend.follows = "";
haskell-nix.follows = "haskell-backend/haskell-nix";
nixpkgs.follows = "haskell-backend/haskell-nix/nixpkgs-unstable";
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extra-deps:
- typerep-map-0.5.0.0
- monad-validate-1.2.0.1
- git: https://github.com/runtimeverification/haskell-backend.git
commit: a6230144a37ee9ebf0f6dffc849faf5ce10df380
commit: 2e33122cd354045da4e5f40dea9344e02c673a64
subdirs:
- kore
- kore-rpc-types
Expand Down
Loading