From 119c7e6d01a6c3491c708564c4efc9ee0092d3ec Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Thu, 14 Aug 2025 17:18:32 +0300 Subject: [PATCH 1/4] Add `--force-reinstall` to Noble Dockerfile --- package/docker/Dockerfile.ubuntu-noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker/Dockerfile.ubuntu-noble b/package/docker/Dockerfile.ubuntu-noble index 0d4838ccf1..892e5bef1d 100644 --- a/package/docker/Dockerfile.ubuntu-noble +++ b/package/docker/Dockerfile.ubuntu-noble @@ -22,5 +22,5 @@ RUN apt-get update COPY kframework-*.whl ./ RUN pipx ensurepath \ && . /root/.profile \ - && pip install /kframework-*.whl --break-system-packages \ + && pip install /kframework-*.whl --break-system-packages --force-reinstall \ && rm /kframework-*.whl From 043d6f0e89478dea78d9f72dd46d0896b8b427e7 Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 26 Aug 2025 14:28:44 +0300 Subject: [PATCH 2/4] Use `pipx install` instead of `pip install` in Noble container --- package/docker/Dockerfile.ubuntu-noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker/Dockerfile.ubuntu-noble b/package/docker/Dockerfile.ubuntu-noble index 892e5bef1d..949e23ca6f 100644 --- a/package/docker/Dockerfile.ubuntu-noble +++ b/package/docker/Dockerfile.ubuntu-noble @@ -22,5 +22,5 @@ RUN apt-get update COPY kframework-*.whl ./ RUN pipx ensurepath \ && . /root/.profile \ - && pip install /kframework-*.whl --break-system-packages --force-reinstall \ + && pipx install /kframework-*.whl --break-system-packages \ && rm /kframework-*.whl From 63ff8dec000000f9709bd140b971f13b972e1cae Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 26 Aug 2025 15:59:51 +0300 Subject: [PATCH 3/4] Remove `--break-system-packages` --- package/docker/Dockerfile.ubuntu-noble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker/Dockerfile.ubuntu-noble b/package/docker/Dockerfile.ubuntu-noble index 949e23ca6f..15e0b2fda0 100644 --- a/package/docker/Dockerfile.ubuntu-noble +++ b/package/docker/Dockerfile.ubuntu-noble @@ -22,5 +22,5 @@ RUN apt-get update COPY kframework-*.whl ./ RUN pipx ensurepath \ && . /root/.profile \ - && pipx install /kframework-*.whl --break-system-packages \ + && pipx install /kframework-*.whl \ && rm /kframework-*.whl From ebc9c1b7e632b999dd7a535f5f816a651eacbe07 Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 26 Aug 2025 18:29:01 +0300 Subject: [PATCH 4/4] More `pipx` refactoring, updating Nix version used in test, release jobs --- .github/workflows/release.yml | 8 ++++---- .github/workflows/test-pr.yml | 8 ++++---- package/docker/Dockerfile.ubuntu-jammy | 6 ++---- package/docker/Dockerfile.ubuntu-noble | 6 ++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f68de724d..e84a7ac3c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,9 +61,9 @@ jobs: - name: 'Install Nix' if: ${{ !startsWith(matrix.os, 'self') }} - uses: cachix/install-nix-action@v22 + uses: cachix/install-nix-action@v31.5.1 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://hydra.iohk.io @@ -105,9 +105,9 @@ jobs: - name: 'Install Nix' if: ${{ !startsWith(matrix.os, 'self') }} - uses: cachix/install-nix-action@v22 + uses: cachix/install-nix-action@v31.5.1 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://hydra.iohk.io diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 829e060020..158e64b998 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -162,9 +162,9 @@ jobs: - name: 'Check out code' uses: actions/checkout@v4 - name: 'Install Nix' - uses: cachix/install-nix-action@v22 + uses: cachix/install-nix-action@v31.5.1 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | 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= @@ -198,9 +198,9 @@ jobs: run: brew install bash - name: 'Install Nix' if: ${{ !startsWith(matrix.os, 'self') }} - uses: cachix/install-nix-action@v22 + uses: cachix/install-nix-action@v31.5.1 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | 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= diff --git a/package/docker/Dockerfile.ubuntu-jammy b/package/docker/Dockerfile.ubuntu-jammy index 5e2b8ae1a2..fd19be3a8e 100644 --- a/package/docker/Dockerfile.ubuntu-jammy +++ b/package/docker/Dockerfile.ubuntu-jammy @@ -19,8 +19,6 @@ RUN apt-get update && apt-get install --yes --no-install-recommends /kframework_amd64_ubuntu_jammy.deb \ && rm /kframework_amd64_ubuntu_jammy.deb +ENV PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin COPY kframework-*.whl ./ -RUN pipx ensurepath \ - && . /root/.profile \ - && pip install /kframework-*.whl \ - && rm /kframework-*.whl +RUN pipx install /kframework-*.whl && rm /kframework-*.whl \ No newline at end of file diff --git a/package/docker/Dockerfile.ubuntu-noble b/package/docker/Dockerfile.ubuntu-noble index 15e0b2fda0..aaffe7428c 100644 --- a/package/docker/Dockerfile.ubuntu-noble +++ b/package/docker/Dockerfile.ubuntu-noble @@ -19,8 +19,6 @@ RUN apt-get update && apt-get install --yes --no-install-recommends /kframework_amd64_ubuntu_noble.deb \ && rm /kframework_amd64_ubuntu_noble.deb +ENV PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin COPY kframework-*.whl ./ -RUN pipx ensurepath \ - && . /root/.profile \ - && pipx install /kframework-*.whl \ - && rm /kframework-*.whl +RUN pipx install /kframework-*.whl && rm /kframework-*.whl \ No newline at end of file