From 32989dac632839c2a4cfbd9c7f41b8b5d61f6313 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Wed, 18 Oct 2023 17:03:02 +0100 Subject: [PATCH 1/2] Rephrase `sed` invocation for macOS (#3724) This PR fixes a really tiny papercut in the regression test suite; out of the box on macOS, the version of `sed` that's installed [doesn't understand the `+` regex operator](https://stackoverflow.com/questions/4453760/how-to-escape-plus-sign-on-mac-os-x-bsd-sed), which causes one test to fail by not slicing out a non-deterministic part of some test output. Rather than trying to install a better version of `sed` for this one case, we just rephrase the regex in question to use `*` instead. --- k-distribution/tests/regression-new/context-labels/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k-distribution/tests/regression-new/context-labels/Makefile b/k-distribution/tests/regression-new/context-labels/Makefile index 48b046f4614..b524f0c38f7 100644 --- a/k-distribution/tests/regression-new/context-labels/Makefile +++ b/k-distribution/tests/regression-new/context-labels/Makefile @@ -4,7 +4,7 @@ KOMPILE_BACKEND=haskell KPROVE_FLAGS+=--debugger --debug-script context-spec.k.in KORE_REPL_OPTS=--log-entries DebugAppliedLabeledRewriteRule export KORE_REPL_OPTS -CONSIDER_PROVER_ERRORS=2>&1 | sed 's!\[[0-9]\+]!!g' # Hacking in a sed command here to remove strings of the form '[23452]' +CONSIDER_PROVER_ERRORS=2>&1 | sed 's!\[[0-9][0-9]*]!!g' # Hacking in a sed command here to remove strings of the form '[23452]' include ../../../include/kframework/ktest.mak From 2ea8c6059a5518d4909912074a276148c86e424a Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Wed, 18 Oct 2023 18:42:56 +0100 Subject: [PATCH 2/2] Drop mentions of Focal from packaging and install documentation (#3725) As part of https://github.com/runtimeverification/k/issues/3591, we are dropping support for Ubuntu Focal so that we can upgrade to JVM 17. In https://github.com/runtimeverification/k/pull/3600, we removed Focal from our CI and packaging workflows. This PR removes any remaining textual references to Ubuntu Focal from the K documentation; no actual code is affected by this change. Co-authored-by: rv-jenkins --- README.md | 14 -------------- k-distribution/INSTALL.md | 12 +++--------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 30e5373674a..1c0d4288d8a 100644 --- a/README.md +++ b/README.md @@ -80,16 +80,6 @@ sudo apt-get install build-essential m4 openjdk-17-jdk libfmt-dev libgmp-dev lib curl -sSL https://get.haskellstack.org/ | sh ``` -On Ubuntu Linux 20.04 (Focal): - -**Note**: the installation process is very similar to the above, the only difference is that clang, lld and llvm-tools have to be version 12. - -```shell -git submodule update --init --recursive -sudo apt-get install build-essential m4 openjdk-11-jdk libfmt-dev libgmp-dev libmpfr-dev pkg-config flex bison z3 libz3-dev maven python3 python3-dev cmake gcc g++ clang-12 lld-12 llvm-12-tools zlib1g-dev libboost-test-dev libyaml-dev libjemalloc-dev -curl -sSL https://get.haskellstack.org/ | sh -``` - On Arch Linux: ```shell @@ -188,10 +178,6 @@ See the notes below. This will provide the information about the JDK Maven is using, in case it is the wrong one. - Note that on Ubuntu Focal, the default Maven version is not compatible with - newer versions of the JDK; for K's Maven build to work, please ensure you - have version 11 installed. - 5. Haskell Stack To install, go to and diff --git a/k-distribution/INSTALL.md b/k-distribution/INSTALL.md index 48121501073..e2ded181652 100644 --- a/k-distribution/INSTALL.md +++ b/k-distribution/INSTALL.md @@ -40,7 +40,7 @@ Install through packages We currently strive to provide packages for the following platforms: -- Ubuntu Focal Fossa (20.04) and Jammy Jellyfish (22.04) +- Ubuntu Jammy Jellyfish (22.04) - Debian Bookworm - Arch Linux - macOS Catalina (10.15), Big Sur (11) and Monterey (12) via Homebrew @@ -52,7 +52,7 @@ Pre-installation Notes - We **do not** currently support running K natively on Windows. To use K on Windows 10, you are encouraged to install the [Windows Subsystem for Linux (version 2)](https://docs.microsoft.com/en-us/windows/wsl/install-win10) - and follow the instructions for installing Ubuntu Focal. + and follow the instructions for installing Ubuntu Jammy. If you have already installed WSL, before proceeding, you will need to enter the WSL environment. You can do this by: @@ -65,7 +65,7 @@ Pre-installation Notes you will need to use a virtual machine (VM) software. We assume you have: 1. Created a virtual machine - 2. Installed a Linux distribution (e.g. Ubuntu Focal Fossa) on your + 2. Installed a Linux distribution (e.g. Ubuntu Jammy Jellyfish) on your virtual machine Consult your virtual machine software if you need help with the above @@ -110,12 +110,6 @@ requires about ~1.4GB of dependencies and will take some time. - On Linux systems, K will typically be installed under `/usr`. - On macOS/brew, K will typically be installed under `/usr/local`. -### Ubuntu Focal (20.04) - -```sh -sudo apt install ./kframework_amd64_ubuntu_jammy.deb -``` - ### Ubuntu Jammy (22.04) ```sh