diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf86be01c72..13eb8a2728b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,7 +102,7 @@ jobs: with: os: ubuntu distro: jammy - llvm: 14 + llvm: 15 pkg-name: kframework_amd64_ubuntu_jammy.deb build-package: package/debian/build-package jammy test-package: package/debian/test-package @@ -349,7 +349,7 @@ jobs: tag: k-release-ci-${{ github.sha }} os: ubuntu distro: jammy - llvm: 14 + llvm: 15 - name: 'Push Maven Packages' shell: bash {0} diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index d13803a5e11..9e19850cbdb 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -109,7 +109,7 @@ jobs: tag: k-ci-${{ github.sha }} os: ubuntu distro: jammy - llvm: 14 + llvm: 15 - name: 'Build and Test K' run: docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'mvn verify --batch-mode -U' - name: 'Check out k-exercises' @@ -142,7 +142,7 @@ jobs: with: os: ubuntu distro: jammy - llvm: 14 + llvm: 15 build-package: package/debian/build-package jammy test-package: package/debian/test-package - name: On Failure, Upload the kore-exec.tar.gz file to the Summary Page diff --git a/flake.lock b/flake.lock index 975b3a0b0f4..efa6476fc11 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1697808331, - "narHash": "sha256-3jDWLywHyoOT2VdyITBl9yzHMw9GX6fRUXqDofjbFKE=", + "lastModified": 1698757479, + "narHash": "sha256-gE4AEKCcckGeJ9hgHeuHunFRweBwXI/dxTkTnjOr0tI=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "480b54218da5f82876f25c70cb96c441f1a8eecd", + "rev": "44a675f1c1d4b53d6f174d67fe9776ddb4c89419", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f4920c4acd..92a44f2f542 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ let allOverlays = [ (_: _: { - llvm-version = 13; + llvm-version = 15; llvm-backend-build-type = "Release"; }) mavenix.overlay llvm-backend.overlays.default diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend index 480b54218da..44a675f1c1d 160000 --- a/llvm-backend/src/main/native/llvm-backend +++ b/llvm-backend/src/main/native/llvm-backend @@ -1 +1 @@ -Subproject commit 480b54218da5f82876f25c70cb96c441f1a8eecd +Subproject commit 44a675f1c1d4b53d6f174d67fe9776ddb4c89419 diff --git a/package/debian/control.jammy b/package/debian/control.jammy index 2a08ce17c6c..8cd6ea1264d 100644 --- a/package/debian/control.jammy +++ b/package/debian/control.jammy @@ -2,7 +2,7 @@ Source: kframework Section: devel Priority: optional Maintainer: Dwight Guth -Build-Depends: clang-14 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev +Build-Depends: clang-15 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev Standards-Version: 3.9.6 Homepage: https://github.com/runtimeverification/k @@ -10,7 +10,7 @@ Package: kframework Architecture: any Section: devel Priority: optional -Depends: bison , clang-14 , openjdk-17-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-0 , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-14 , llvm-14 , pkg-config +Depends: bison , clang-15 , openjdk-17-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-0 , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-15 , llvm-15 , pkg-config Recommends: z3 Description: K framework toolchain Includes K Framework compiler for K language definitions, and K interpreter