From 343c564324f90bb3edcaeb4b6d8d3130a21853e5 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Fri, 19 Jul 2024 13:03:10 -0600 Subject: [PATCH 1/3] Update dependency: deps/llvm-backend_release (#4534) Co-authored-by: devops Co-authored-by: Bruce Collie --- .github/workflows/update-deps.yml | 2 +- deps/llvm-backend_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- llvm-backend/src/main/native/llvm-backend | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 9a66903a64b..4cd7ccdd36d 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -59,7 +59,7 @@ jobs: cd llvm-backend/src/main/native/llvm-backend git checkout "${llvm_backend_version}" cd - - sed -i 's! url = "github:runtimeverification/llvm-backend/.*";! url = "github:runtimeverification/llvm-backend/'"${llvm_backend_version}"'";!' flake.nix + sed -i 's! llvm-backend.url = "github:runtimeverification/llvm-backend/.*";! llvm-backend.url = "github:runtimeverification/llvm-backend/'"${llvm_backend_version}"'";!' flake.nix if git add flake.nix llvm-backend/src/main/native/llvm-backend && git commit -m "flake.nix, llvm-backend/src/main/native/llvm-backend: update to version ${llvm_backend_version}"; then changed=true fi diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release index 920c3bd5154..09d8256ac3a 100644 --- a/deps/llvm-backend_release +++ b/deps/llvm-backend_release @@ -1 +1 @@ -0.1.57 +0.1.59 diff --git a/flake.lock b/flake.lock index 46723f73c95..a72739ebae6 100644 --- a/flake.lock +++ b/flake.lock @@ -112,16 +112,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1720605767, - "narHash": "sha256-f2+y13P306W0Ws7gfjVkG4jytHqfSY0qAd4KeF/qZno=", + "lastModified": 1721409969, + "narHash": "sha256-D9F6JhSsDOwGx6/ysi4O7d+A3aGNliEXOKgXvViRD00=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "bd12ae4ace1f288b3b6236cc42f7004fe38e9965", + "rev": "ed79b7ead98fff940ef683e61653d4d30a47b663", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.56", + "ref": "v0.1.59", "repo": "llvm-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index 27f5802fdee..c66b6315b05 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "K Framework"; inputs = { - llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.56"; + llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.59"; haskell-backend = { url = "github:runtimeverification/haskell-backend/v0.1.32"; inputs.rv-utils.follows = "llvm-backend/rv-utils"; diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend index 66f927392e5..ed79b7ead98 160000 --- a/llvm-backend/src/main/native/llvm-backend +++ b/llvm-backend/src/main/native/llvm-backend @@ -1 +1 @@ -Subproject commit 66f927392e52843589a7a548802a9e2305a6a152 +Subproject commit ed79b7ead98fff940ef683e61653d4d30a47b663 From e49ebb057e3404341749ac37c8d0d8dbd20d8a2c Mon Sep 17 00:00:00 2001 From: Jost Berthold Date: Mon, 22 Jul 2024 19:27:20 +1000 Subject: [PATCH 2/3] Hotfix adjust sed expression for flake update hs backend (#4539) The upgrade mechanism for HS backend in `k` was broken by some changes to the nix flake which modified the syntax for the `haskell-backend` dependency in `flake.nix`. This PR fixes the update script and updates HS backend to the latest version. * [update-deps.yml] adjusts the `sed` expression * (by manually running the shell script from the above:) - update HS backend to version 0.1.46 - update `flake.lock` to reflect this update --- .github/workflows/update-deps.yml | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 4cd7ccdd36d..f709e32934b 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -50,7 +50,7 @@ jobs: cd haskell-backend/src/main/native/haskell-backend git checkout "${hs_backend_version}" cd - - sed -i 's! haskell-backend.url = "github:runtimeverification/haskell-backend/.*";! haskell-backend.url = "github:runtimeverification/haskell-backend/'"${hs_backend_version}"'";!' flake.nix + sed -i 's! url = "github:runtimeverification/haskell-backend/.*";! url = "github:runtimeverification/haskell-backend/'"${hs_backend_version}"'";!' flake.nix if git add flake.nix haskell-backend/src/main/native/haskell-backend && git commit -m "flake.nix, haskell-backend/src/main/native/haskell-backend: update to version ${hs_backend_version}"; then changed=true fi diff --git a/flake.lock b/flake.lock index a72739ebae6..63fee7cccf7 100644 --- a/flake.lock +++ b/flake.lock @@ -65,16 +65,16 @@ "z3": "z3" }, "locked": { - "lastModified": 1720572621, - "narHash": "sha256-/j0swzk75vBmtYE62t044W7tCRULxwYfygb+C01Ar9A=", + "lastModified": 1721316629, + "narHash": "sha256-Iq161QQX78LtJnDyOm2zv0c+leGBb/bo0laKsk86pUo=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "3ecef6a3bf991a95ac3dba2900a721bbcd5f5ce7", + "rev": "8d61e69a3cc73ae15306775bb2e97ec31247690a", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.32", + "ref": "v0.1.46", "repo": "haskell-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index c66b6315b05..a20a08616eb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.59"; haskell-backend = { - url = "github:runtimeverification/haskell-backend/v0.1.32"; + url = "github:runtimeverification/haskell-backend/v0.1.46"; inputs.rv-utils.follows = "llvm-backend/rv-utils"; inputs.nixpkgs.follows = "llvm-backend/nixpkgs"; }; From 378d325f11d56c1101d38424779f08c95a6b6ad2 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 22 Jul 2024 04:41:55 -0600 Subject: [PATCH 3/3] Update dependency: deps/llvm-backend_release (#4538) Co-authored-by: devops --- deps/llvm-backend_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- llvm-backend/src/main/native/llvm-backend | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release index 09d8256ac3a..1ec9b0b6463 100644 --- a/deps/llvm-backend_release +++ b/deps/llvm-backend_release @@ -1 +1 @@ -0.1.59 +0.1.60 diff --git a/flake.lock b/flake.lock index 63fee7cccf7..4c8ace23457 100644 --- a/flake.lock +++ b/flake.lock @@ -112,16 +112,16 @@ "utils": "utils" }, "locked": { - "lastModified": 1721409969, - "narHash": "sha256-D9F6JhSsDOwGx6/ysi4O7d+A3aGNliEXOKgXvViRD00=", + "lastModified": 1721505758, + "narHash": "sha256-eZak/AaPOGTeiihbDWRCe4SeQfC9br1GCynx1neIL/Q=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "ed79b7ead98fff940ef683e61653d4d30a47b663", + "rev": "548a54ccb12c9f3fff37914d46f0879a88f41590", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.59", + "ref": "v0.1.60", "repo": "llvm-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index a20a08616eb..de83005782a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "K Framework"; inputs = { - llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.59"; + llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.60"; haskell-backend = { url = "github:runtimeverification/haskell-backend/v0.1.46"; inputs.rv-utils.follows = "llvm-backend/rv-utils"; diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend index ed79b7ead98..548a54ccb12 160000 --- a/llvm-backend/src/main/native/llvm-backend +++ b/llvm-backend/src/main/native/llvm-backend @@ -1 +1 @@ -Subproject commit ed79b7ead98fff940ef683e61653d4d30a47b663 +Subproject commit 548a54ccb12c9f3fff37914d46f0879a88f41590