From bf7fad507e7d6773ac546b20b773f5060edd73c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Tue, 7 Jan 2025 10:52:36 +0000 Subject: [PATCH 1/3] Fix Poetry version to 1.8.5 --- .github/actions/setup-pyk-env/action.yml | 2 ++ .github/actions/with-k-docker/Dockerfile | 2 +- .github/workflows/release.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-pyk-env/action.yml b/.github/actions/setup-pyk-env/action.yml index 015ffcebb52..fe7b0f57dd8 100644 --- a/.github/actions/setup-pyk-env/action.yml +++ b/.github/actions/setup-pyk-env/action.yml @@ -15,6 +15,8 @@ runs: python-version: ${{ inputs.python-version }} - name: 'Install Poetry' uses: Gr1N/setup-poetry@v9 + with: + poetry-version: '1.8.5' - name: 'Install package' shell: bash run: poetry -C pyk install diff --git a/.github/actions/with-k-docker/Dockerfile b/.github/actions/with-k-docker/Dockerfile index 09f800e3669..853c1a1cefa 100644 --- a/.github/actions/with-k-docker/Dockerfile +++ b/.github/actions/with-k-docker/Dockerfile @@ -38,5 +38,5 @@ USER user WORKDIR /home/user ENV PATH=/home/user/.local/bin:${PATH} -RUN curl -sSL https://install.python-poetry.org | python3 - \ +RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.5 \ && poetry --version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a89d1cef418..9b612f3c840 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -491,6 +491,8 @@ jobs: - name: Install Poetry uses: Gr1N/setup-poetry@v9 + with: + poetry-version: '1.8.5' - name: Build pyk working-directory: pyk From 00ab51d17c90d50cfa6e6042854a29eec9140195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Tue, 7 Jan 2025 10:53:01 +0000 Subject: [PATCH 2/3] Remove `pyk/Dockerfile` --- pyk/Dockerfile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 pyk/Dockerfile diff --git a/pyk/Dockerfile b/pyk/Dockerfile deleted file mode 100644 index 550a3ea3139..00000000000 --- a/pyk/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -ARG K_DISTRO=jammy -ARG K_VERSION -FROM runtimeverificationinc/kframework-k:ubuntu-${K_DISTRO}-${K_VERSION} - -ARG PYTHON_VERSION=3.10 - -RUN apt-get -y update \ - && apt-get -y install \ - curl \ - graphviz \ - python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-dev \ - && apt-get -y clean - -RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/usr python3 - \ - && poetry --version - -ARG USER_ID=9876 -ARG GROUP_ID=9876 -RUN groupadd -g ${GROUP_ID} user \ - && useradd -m -u ${USER_ID} -s /bin/sh -g user user From 2eca2db9bc22ab151351cd1197a9c5a77280f994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20T=C3=B3th?= Date: Tue, 7 Jan 2025 10:56:07 +0000 Subject: [PATCH 3/3] Make runner version explicit --- .github/workflows/master-push.yml | 2 +- .github/workflows/release.yml | 8 ++++---- .github/workflows/run-actionlint.yml | 2 +- .github/workflows/test-pr.yml | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master-push.yml b/.github/workflows/master-push.yml index 359d5157e4a..85317f8d205 100644 --- a/.github/workflows/master-push.yml +++ b/.github/workflows/master-push.yml @@ -7,7 +7,7 @@ on: jobs: gh-release: name: 'Publish GitHub Prerelease' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: 'Check out code' uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b612f3c840..81e377a6803 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: source-tarball: name: 'Create source tarball' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 environment: production steps: - name: 'Check out code' @@ -475,7 +475,7 @@ jobs: pyk-publish: name: 'Publish pyk' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 environment: production permissions: id-token: write @@ -514,10 +514,10 @@ jobs: fi sleep 10 done - + notify-dependents: name: 'Notify Dependents' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: pyk-publish steps: - name: Check out code diff --git a/.github/workflows/run-actionlint.yml b/.github/workflows/run-actionlint.yml index 2d7cd5f6a09..34ff5135aa5 100644 --- a/.github/workflows/run-actionlint.yml +++ b/.github/workflows/run-actionlint.yml @@ -4,7 +4,7 @@ on: pull_request jobs: actionlint: name: Run actionlint - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Download actionlint diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 3e4c05270ff..7c90f102843 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -11,7 +11,7 @@ concurrency: jobs: format-check: name: 'Java: Linting' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: 'Check out code' uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: pyk-code-quality-checks: name: 'Pyk: Code Quality & Unit Tests' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 5 strategy: fail-fast: false @@ -56,7 +56,7 @@ jobs: code-quality: name: 'Code Quality Checks' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: - format-check - pyk-code-quality-checks @@ -156,7 +156,7 @@ jobs: name: 'Pyk: Nix Build' strategy: matrix: - os: [ubuntu-latest, macos-14] + os: [ubuntu-24.04, macos-14] runs-on: ${{ matrix.os }} steps: - name: 'Check out code' @@ -311,7 +311,7 @@ jobs: pyk-regression-tests: needs: test-frontend-package-ubuntu-jammy name: 'Pyk: Regression Tests' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - name: 'Check out code'