From c974372899291889dfab0727d29ef267601adc3e Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Wed, 1 Nov 2023 09:30:30 +0000 Subject: [PATCH 1/3] Bump LLVM to 15 --- .github/workflows/release.yml | 4 ++-- package/debian/control.jammy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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 From a6312ece257c87d642960bc921132eb0245957b4 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Wed, 1 Nov 2023 09:43:10 +0000 Subject: [PATCH 2/3] Missing cases --- .github/workflows/test-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index d27cb8e808f..283a667943f 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -87,7 +87,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' @@ -120,7 +120,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 From 4ac068bd619d0e71e9a221311bc8d53c4f7bb3e0 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Thu, 2 Nov 2023 08:56:53 +0000 Subject: [PATCH 3/3] Update flake default version --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7e2020c1fff..022c7197da0 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