diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 40b1d30c325..117e4c975d5 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -55,7 +55,7 @@ jobs: run: | set -euxo pipefail workspace=$(pwd) - docker run --name ci-${GITHUB_SHA} \ + docker run --name k-posting-profiling-tests-${GITHUB_SHA} \ --rm -it --detach \ -e BENCHER_API_TOKEN=$BENCHER_API_TOKEN \ -e BENCHER_PROJECT=$BENCHER_PROJECT \ @@ -73,20 +73,20 @@ jobs: - name: 'Setting up dependencies' run: | set -euxo pipefail - docker exec -t k-profiling-tests-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/setup_profiling.sh SKIP_K_BUILD' + docker exec -t k-posting-profiling-tests-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/setup_profiling.sh SKIP_K_BUILD' - name: 'Getting Performance Tests Results' run: | set -euxo pipefail - docker exec -t ci-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/post_results_to_develop.py' + docker exec -t k-posting-profiling-tests-${GITHUB_SHA} /bin/bash -c './k-distribution/tests/profiling/post_results_to_develop.py' - name: 'Posting Performance Tests Results' run: | set -euxo pipefail - docker exec -t ci-${GITHUB_SHA} /bin/bash -c 'bencher run \ + docker exec -t k-posting-profiling-tests-${GITHUB_SHA} /bin/bash -c 'bencher run \ --if-branch "develop" --else-if-branch "master" \ --file .profiling-results.json --err --ci-only-on-alert \ --github-actions "${GITHUB_TOKEN}" 'echo "Exporting report"' - name: 'Tear down Docker' if: always() run: | - docker stop --time=0 ci-${GITHUB_SHA} - docker container rm --force ci-${GITHUB_SHA} || true \ No newline at end of file + docker stop --time=0 k-posting-profiling-tests-${GITHUB_SHA} + docker container rm --force k-posting-profiling-tests-${GITHUB_SHA} || true diff --git a/flake.nix b/flake.nix index 936ef074b9a..28ace0dcf73 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ # NB booster-backend will bring in another dependency on haskell-backend, # but the two are not necessarily the same (different more often than not). # We get two transitive dependencies on haskell-nix. - inputs.k-framework.follows = ""; inputs.nixpkgs.follows = "haskell-backend/nixpkgs"; }; llvm-backend.url = "github:runtimeverification/llvm-backend"; diff --git a/k-distribution/src/main/scripts/lib/k b/k-distribution/src/main/scripts/lib/k index 0a8d9ed0094..34f4bf3b639 100755 --- a/k-distribution/src/main/scripts/lib/k +++ b/k-distribution/src/main/scripts/lib/k @@ -5,6 +5,7 @@ ulimit -s "$(ulimit -H -s)" K_BASE="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)" GIT_DESCRIBE="${K_BASE}/kframework/git-describe.out" TIMESTAMP="${K_BASE}/kframework/timestamp.out" +version= for flag in "$@"; do if [[ "$flag" == "--version" ]]; then