diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index aa4589e39c2..0f06a6b50e9 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -44,100 +44,100 @@ jobs: git config user.name devops git config user.email devops@runtimeverification.com - - name: 'Install Nix' - uses: cachix/install-nix-action@v22 - with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= + # - name: 'Install Nix' + # uses: cachix/install-nix-action@v22 + # with: + # install_url: https://releases.nixos.org/nix/nix-2.13.3/install + # extra_nix_config: | + # access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + # substituters = http://cache.nixos.org https://hydra.iohk.io + # trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - - name: 'Install Cachix' - uses: cachix/cachix-action@v12 - with: - name: k-framework - authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' - skipPush: true + # - name: 'Install Cachix' + # uses: cachix/cachix-action@v12 + # with: + # name: k-framework + # authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' + # skipPush: true - - name: 'Update Maven dependencies, push changes' - run: | - set -x - git checkout ${GITHUB_HEAD_REF} - if ! git diff --exit-code origin/${GITHUB_BASE_REF} origin/${GITHUB_HEAD_REF} \ - -- $(find . -name pom.xml); then - nix run .#update-maven - fi - if git add nix/ && git commit -m 'Update Nix lock files'; then - git push - fi + # - name: 'Update Maven dependencies, push changes' + # run: | + # set -x + # git checkout ${GITHUB_HEAD_REF} + # if ! git diff --exit-code origin/${GITHUB_BASE_REF} origin/${GITHUB_HEAD_REF} \ + # -- $(find . -name pom.xml); then + # nix run .#update-maven + # fi + # if git add nix/ && git commit -m 'Update Nix lock files'; then + # git push + # fi test-k: name: 'K Tests' - runs-on: [self-hosted, linux, normal] + runs-on: [self-hosted, linux, github-runner-17] needs: version-sync steps: - name: 'Check out code' uses: actions/checkout@v3 with: submodules: recursive - - name: 'Set up Docker' - uses: ./.github/actions/with-docker - with: - tag: k-ci-${{ github.sha }} - os: ubuntu - distro: jammy - llvm: 14 - - 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' - uses: actions/checkout@v3 - with: - repository: runtimeverification/k-exercises - token: ${{ secrets.JENKINS_GITHUB_PAT }} - submodules: recursive - path: k-exercises - - name: 'Tutorial Integration Tests' - run: | - docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'k-distribution/target/release/k/bin/spawn-kserver kserver.log' - docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-exercises/tutorial && make -j`nproc` --output-sync' - docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/k-tutorial/1_basic && ./test_kompile.sh' - docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/k-tutorial/2_intermediate && ./test_kompile.sh' - - name: 'Tear down Docker' - if: always() - run: | - docker stop --time=0 k-ci-${GITHUB_SHA} - docker container rm --force k-ci-${GITHUB_SHA} || true + # - name: 'Set up Docker' + # uses: ./.github/actions/with-docker + # with: + # tag: k-ci-${{ github.sha }} + # os: ubuntu + # distro: jammy + # llvm: 14 + # - 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' + # uses: actions/checkout@v3 + # with: + # repository: runtimeverification/k-exercises + # token: ${{ secrets.JENKINS_GITHUB_PAT }} + # submodules: recursive + # path: k-exercises + # - name: 'Tutorial Integration Tests' + # run: | + # docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'k-distribution/target/release/k/bin/spawn-kserver kserver.log' + # docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-exercises/tutorial && make -j`nproc` --output-sync' + # docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/k-tutorial/1_basic && ./test_kompile.sh' + # docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/k-tutorial/2_intermediate && ./test_kompile.sh' + # - name: 'Tear down Docker' + # if: always() + # run: | + # docker stop --time=0 k-ci-${GITHUB_SHA} + # docker container rm --force k-ci-${GITHUB_SHA} || true test-package-ubuntu-jammy: name: 'K Ubuntu Jammy Package' - runs-on: [self-hosted, linux, normal] + runs-on: [self-hosted, linux, github-runner-17] needs: version-sync steps: - uses: actions/checkout@v3 - - name: 'Build and Test' - uses: ./.github/actions/test-package - with: - os: ubuntu - distro: jammy - llvm: 14 - 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 - if: failure() - uses: actions/upload-artifact@v2 - with: - name: kore-exec.tar.gz - path: | - **/kore-exec.tar.gz - - name: 'On Success, Upload the package built to the Summary Page' - if: success() - uses: actions/upload-artifact@v3 - with: - name: kframework.deb - path: kframework.deb - if-no-files-found: error - retention-days: 1 + # - name: 'Build and Test' + # uses: ./.github/actions/test-package + # with: + # os: ubuntu + # distro: jammy + # llvm: 14 + # 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 + # if: failure() + # uses: actions/upload-artifact@v2 + # with: + # name: kore-exec.tar.gz + # path: | + # **/kore-exec.tar.gz + # - name: 'On Success, Upload the package built to the Summary Page' + # if: success() + # uses: actions/upload-artifact@v3 + # with: + # name: kframework.deb + # path: kframework.deb + # if-no-files-found: error + # retention-days: 1 performance-tests: name: 'Performace Tests' @@ -145,49 +145,49 @@ jobs: needs: test-package-ubuntu-jammy steps: - uses: actions/checkout@v3 - - name: 'Download K package from the Summary Page' - uses: actions/download-artifact@v3 - with: - name: kframework.deb - - name: 'Set up Docker Test Image' - env: - BASE_OS: ubuntu - BASE_DISTRO: jammy - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BENCHER_API_TOKEN: ${{ secrets.BENCHER_API_TOKEN }} - BENCHER_PROJECT: k-framework - BENCHER_ADAPTER: json - run: | - set -euxo pipefail - workspace=$(pwd) - docker run --name k-profiling-tests-${GITHUB_SHA} \ - --rm -it --detach \ - -e BENCHER_API_TOKEN=$BENCHER_API_TOKEN \ - -e BENCHER_PROJECT=$BENCHER_PROJECT \ - -e BENCHER_ADAPTER=$BENCHER_ADAPTER \ - -e GITHUB_HEAD_REF=$GITHUB_HEAD_REF \ - -e GITHUB_BASE_REF=$GITHUB_BASE_REF \ - -e GITHUB_TOKEN=$GITHUB_TOKEN \ - -e GITHUB_ACTIONS=true \ - -e GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME \ - -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY \ - -e GITHUB_REF=$GITHUB_REF \ - --workdir /opt/workspace \ - -v "${workspace}:/opt/workspace" \ - ${BASE_OS}:${BASE_DISTRO} - - name: 'Install K from Package' - run: | - set -euxo pipefail - docker exec -t k-profiling-tests-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/setup_profiling.sh' - - name: 'Profiling Performance Tests' - run: | - set -euxo pipefail - docker exec -t k-profiling-tests-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/tests/profiling && make' - - name: 'Tear down Docker' - if: always() - run: | - docker stop --time=0 k-profiling-tests-${GITHUB_SHA} - docker container rm --force k-profiling-tests-${GITHUB_SHA} || true + # - name: 'Download K package from the Summary Page' + # uses: actions/download-artifact@v3 + # with: + # name: kframework.deb + # - name: 'Set up Docker Test Image' + # env: + # BASE_OS: ubuntu + # BASE_DISTRO: jammy + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # BENCHER_API_TOKEN: ${{ secrets.BENCHER_API_TOKEN }} + # BENCHER_PROJECT: k-framework + # BENCHER_ADAPTER: json + # run: | + # set -euxo pipefail + # workspace=$(pwd) + # docker run --name k-profiling-tests-${GITHUB_SHA} \ + # --rm -it --detach \ + # -e BENCHER_API_TOKEN=$BENCHER_API_TOKEN \ + # -e BENCHER_PROJECT=$BENCHER_PROJECT \ + # -e BENCHER_ADAPTER=$BENCHER_ADAPTER \ + # -e GITHUB_HEAD_REF=$GITHUB_HEAD_REF \ + # -e GITHUB_BASE_REF=$GITHUB_BASE_REF \ + # -e GITHUB_TOKEN=$GITHUB_TOKEN \ + # -e GITHUB_ACTIONS=true \ + # -e GITHUB_EVENT_NAME=$GITHUB_EVENT_NAME \ + # -e GITHUB_REPOSITORY=$GITHUB_REPOSITORY \ + # -e GITHUB_REF=$GITHUB_REF \ + # --workdir /opt/workspace \ + # -v "${workspace}:/opt/workspace" \ + # ${BASE_OS}:${BASE_DISTRO} + # - name: 'Install K from Package' + # run: | + # set -euxo pipefail + # docker exec -t k-profiling-tests-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/setup_profiling.sh' + # - name: 'Profiling Performance Tests' + # run: | + # set -euxo pipefail + # docker exec -t k-profiling-tests-${GITHUB_SHA} /bin/bash -c 'cd k-distribution/tests/profiling && make' + # - name: 'Tear down Docker' + # if: always() + # run: | + # docker stop --time=0 k-profiling-tests-${GITHUB_SHA} + # docker container rm --force k-profiling-tests-${GITHUB_SHA} || true compile-nix-flake: name: 'Nix flake' @@ -195,7 +195,7 @@ jobs: fail-fast: false matrix: include: - - runner: [self-hosted, linux, normal] + - runner: [self-hosted, linux, github-runner-17] - runner: macos-13 os: macos-13 - runner: MacM1 @@ -206,33 +206,33 @@ jobs: - name: 'Check out code' uses: actions/checkout@v3 - - name: 'Upgrade bash' - if: ${{ contains(matrix.os, 'macos') }} - run: brew install bash + # - name: 'Upgrade bash' + # if: ${{ contains(matrix.os, 'macos') }} + # run: brew install bash - - name: 'Install Nix' - if: ${{ !startsWith(matrix.os, 'self') }} - uses: cachix/install-nix-action@v22 - with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= + # - name: 'Install Nix' + # if: ${{ !startsWith(matrix.os, 'self') }} + # uses: cachix/install-nix-action@v22 + # with: + # install_url: https://releases.nixos.org/nix/nix-2.13.3/install + # extra_nix_config: | + # access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + # substituters = http://cache.nixos.org https://hydra.iohk.io + # trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - - name: 'Install Cachix' - if: ${{ !startsWith(matrix.os, 'self') }} - uses: cachix/cachix-action@v12 - with: - name: k-framework - authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' + # - name: 'Install Cachix' + # if: ${{ !startsWith(matrix.os, 'self') }} + # uses: cachix/cachix-action@v12 + # with: + # name: k-framework + # authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' - - name: 'Build K Framework' - run: GC_DONT_GC=1 nix build --print-build-logs . + # - name: 'Build K Framework' + # run: GC_DONT_GC=1 nix build --print-build-logs . - # These tests take a really long time to run on other platforms, so we - # skip them unless we're on the M1 runner. - - name: 'Test K' - if: ${{ matrix.os == 'self-macos-12' }} - run: GC_DONT_GC=1 nix build --print-build-logs .#test + # # These tests take a really long time to run on other platforms, so we + # # skip them unless we're on the M1 runner. + # - name: 'Test K' + # if: ${{ matrix.os == 'self-macos-12' }} + # run: GC_DONT_GC=1 nix build --print-build-logs .#test diff --git a/install-k b/install-k index 66754d5fbeb..ac78b0c1516 100755 --- a/install-k +++ b/install-k @@ -1,6 +1,6 @@ #!/bin/sh -e -K_VERSION=6.0.0 +K_VERSION=6.0.101 if [ `id -u` -ne 0 ]; then echo "$0: error: This script must be run as root." diff --git a/package/arch/PKGBUILD b/package/arch/PKGBUILD index 562d5f62cc4..b93cb87bde2 100644 --- a/package/arch/PKGBUILD +++ b/package/arch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dwight Guth pkgname=kframework-git -pkgver=6.0.0 +pkgver=6.0.101 pkgrel=1 epoch= pkgdesc="K framework toolchain. Includes K Framework compiler for K language definitions, and K interpreter and prover for programs written in languages defined in K." diff --git a/package/debian/changelog b/package/debian/changelog index 0fa471e68cf..bdf9e301991 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -kframework (6.0.0) unstable; urgency=medium +kframework (6.0.101) unstable; urgency=medium * Initial Release. diff --git a/package/version b/package/version index 09b254e90c6..5fb1de00f4c 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -6.0.0 +6.0.101