Merge remote-tracking branch 'origin/develop'

runtimeverification · Dec 6, 2023 · 03bf7fd · 03bf7fd
2 parents d95999e + 61fdda6
commit 03bf7fd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/Dockerfile.stack-deps b/.github/workflows/Dockerfile.stack-deps
@@ -33,4 +33,5 @@ RUN cd /home/$USER/.tmp-haskell && stack build --only-snapshot
 ENV LC_ALL=C.UTF-8
 ADD --chown=$USER:$GROUP hs-backend-booster/src/main/native/hs-backend-booster/stack.yaml                    /home/$USER/.tmp-booster/
 ADD --chown=$USER:$GROUP hs-backend-booster/src/main/native/hs-backend-booster/package.yaml                  /home/$USER/.tmp-booster/
+ADD --chown=$USER:$GROUP hs-backend-booster/src/main/native/hs-backend-booster/dev-tools/package.yaml        /home/$USER/.tmp-booster/dev-tools/
 RUN cd /home/$USER/.tmp-booster && stack build --only-snapshot
diff --git a/deps/hs-backend-booster_release b/deps/hs-backend-booster_release
@@ -1 +1 @@
-ffd277b68ef1993ab7b94d6e7593729208c21f11
+5294940d0f5a58a685b0f30934ed8fdb5dd3fa14
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
   inputs = {
     haskell-backend.url = "github:runtimeverification/haskell-backend/0be07d293a1167615ef9342bb1820350f794e893";
     booster-backend = {
-      url = "github:runtimeverification/hs-backend-booster/ffd277b68ef1993ab7b94d6e7593729208c21f11";
+      url = "github:runtimeverification/hs-backend-booster/5294940d0f5a58a685b0f30934ed8fdb5dd3fa14";
       inputs.nixpkgs.follows = "haskell-backend/nixpkgs";
       inputs.haskell-backend.follows = "haskell-backend";
       inputs.stacklock2nix.follows = "haskell-backend/stacklock2nix";

diff --git a/hs-backend-booster/pom.xml b/hs-backend-booster/pom.xml
@@ -61,6 +61,7 @@
                 <mkdir dir="${project.build.directory}/stack-install" />
                 <exec executable="stack" dir="${project.basedir}/src/main/native/hs-backend-booster" failonerror="true">
                   <arg value="install" />
+                  <arg value="hs-backend-booster" />
                   <arg line="${stack.extra-opts}" />
                   <arg value="--local-bin-path=${project.build.directory}/stack-install" />
                 </exec>

diff --git a/hs-backend-booster/src/main/native/hs-backend-booster b/hs-backend-booster/src/main/native/hs-backend-booster
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ffd277b68ef1993ab7b94d6e7593729208c21f11
		5294940d0f5a58a685b0f30934ed8fdb5dd3fa14
+4 −3		.github/workflows/test.yml
+2 −1		.gitignore
+5 −3		cabal.project
+1 −0		dev-tools/LICENSE
+0 −0		dev-tools/booster-dev/Server.hs
+0 −0		dev-tools/eventlog-parser/EventlogParser.hs
+0 −0		dev-tools/eventlog-parser/FrameDict.hs
+0 −0		dev-tools/kore-json-differ/Main.hs
+0 −0		dev-tools/kore-rpc-dev/Server.hs
+175 −0		dev-tools/package.yaml
+0 −0		dev-tools/parsetest-binary/ParsetestBinary.hs
+0 −0		dev-tools/parsetest/Parsetest.hs
+0 −0		dev-tools/tarball-compare/Main.hs
+1 −119		package.yaml
+1 −1		scripts/integration-tests.sh
+1 −0		stack.yaml
+5 −5		test/rpc-integration/README.md
+2 −2		test/rpc-integration/runDirectoryTest.sh