Merge branch 'develop' into _update-deps/runtimeverification/llvm-bac…

…kend

.github/workflows/release.yml

@@ -117,59 +117,7 @@ jobs:
           name: kore-exec.tar.gz
           path: |
             **/kore-exec.tar.gz
- 
-  ubuntu-focal:
-    name: 'K Ubuntu Focal Package'
-    runs-on: [self-hosted, linux, normal]
-    timeout-minutes: 90
-    steps:
-      - uses: actions/checkout@v3
-      - name: 'Build and Test Package'
-        uses: ./.github/actions/test-package
-        with:
-          os: ubuntu
-          distro: focal
-          llvm: 12
-          jdk: 11
-          pkg-name: kframework_amd64_ubuntu_focal.deb
-          build-package: package/debian/build-package focal
-          test-package: package/debian/test-package
-      - name: 'Upload Package to Release'
-        env:
-          GITHUB_TOKEN: ${{ secrets.JENKINS_GITHUB_PAT }}
-        run: |
-          set -x
-          version=$(cat package/version)
-          cp kframework_amd64_ubuntu_focal.deb kframework_${version}_amd64_ubuntu_focal.deb
-          gh release upload --repo runtimeverification/k --clobber v${version} kframework_${version}_amd64_ubuntu_focal.deb
-      - name: 'Build, Test, and Push Dockerhub Image'
-        shell: bash {0}
-        env:
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOCKERHUB_REPO: runtimeverificationinc/kframework-k
-        run: |
-          set -euxo pipefail
-          version=$(cat package/version)
-          version_tag=ubuntu-focal-${version}
-          docker login --username rvdockerhub --password ${DOCKERHUB_PASSWORD}
-          docker image build . --file package/docker/Dockerfile.ubuntu-focal --tag ${DOCKERHUB_REPO}:${version_tag}
-          docker run --name k-package-docker-test-focal-${GITHUB_SHA} --rm -it --detach ${DOCKERHUB_REPO}:${version_tag}
-          docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && echo "module TEST imports BOOL endmodule" > test.k'
-          docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend llvm'
-          docker exec -t k-package-docker-test-focal-${GITHUB_SHA} bash -c 'cd ~ && kompile test.k --backend haskell'
-          docker image push ${DOCKERHUB_REPO}:${version_tag}
-      - name: 'Clean up Docker Container'
-        if: always()
-        run: |
-          docker stop --time=0 k-package-docker-test-focal-${GITHUB_SHA}
-      - name: On Failure, Upload the kore-exec.tar.gz file to the Summary Page
-        if: failure()
-        uses: actions/upload-artifact@v2
-        with:
-          name: kore-exec.tar.gz
-          path: |
-            **/kore-exec.tar.gz
-   
+
   debian-bookworm:
     name: 'K Debian Bookworm Package'
     runs-on: [self-hosted, linux, normal]
@@ -400,7 +348,7 @@ jobs:
     name: 'Publish Release'
     runs-on: [self-hosted, linux, normal]
     environment: production
-    needs: [nix-release, macos-build, macos-test, source-tarball, ubuntu-jammy, ubuntu-focal, debian-bookworm, set-release-id, arch]
+    needs: [nix-release, macos-build, macos-test, source-tarball, ubuntu-jammy, debian-bookworm, set-release-id, arch]
     steps:
       - name: 'Check out code'
         uses: actions/checkout@v3
@@ -416,7 +364,7 @@ jobs:
           server-id: runtime.verification.snapshots
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
-      
+
       # Build and Run Tests in Docker
       - name: 'Set up Docker'
         uses: ./.github/actions/with-docker

install-k

@@ -12,7 +12,7 @@ case $ID in
 	ubuntu)
 		CODENAME=$UBUNTU_CODENAME
 		case $CODENAME in
-			bionic|focal|jammy)
+			jammy)
 				;;
 			*)
 				echo "Unsupported Ubuntu version, try building from source."

k-distribution/INSTALL.md

@@ -113,7 +113,7 @@ requires about ~1.4GB of dependencies and will take some time.
 ### Ubuntu Focal (20.04)
 
 ```sh
-sudo apt install ./kframework_amd64_ubuntu_focal.deb
+sudo apt install ./kframework_amd64_ubuntu_jammy.deb
 ```
 
 ### Ubuntu Jammy (22.04)
@@ -176,19 +176,19 @@ Docker images with K pre-installed are available at the
 [runtimeverification/kframework-k Docker Hub repository](https://hub.docker.com/repository/docker/runtimeverificationinc/kframework-k).
 
 Each release at `COMMIT_ID` has an image associated with it at
-`runtimeverificationinc/kframework-k:ubuntu-focal-COMMIT_ID`.
+`runtimeverificationinc/kframework-k:ubuntu-jammy-COMMIT_ID`.
 
 To run the image directly:
 
 ```sh
-docker run -it runtimeverificationinc/kframework-k:ubuntu-focal-COMMIT_ID
+docker run -it runtimeverificationinc/kframework-k:ubuntu-jammy-COMMIT_ID
 ```
 
 and to make a Docker Image based on it, use the following line in your
 `Dockerfile`:
 
 ```Dockerfile
-FROM runtimeverificationinc/kframework-k:ubuntu-focal-COMMIT_ID
+FROM runtimeverificationinc/kframework-k:ubuntu-jammy-COMMIT_ID
 ```
 
 We also create Ubuntu 22.04 images with the `ubuntu-jammy-COMMIT_ID` tags.

package/debian/Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:focal
+ARG BASE_IMAGE=ubuntu:jammy
 FROM ${BASE_IMAGE}
 ARG BASE_IMAGE