From 5e1940fdd3fcfa1afaca1f230e01f397c26c66bf Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Tue, 30 Jul 2024 19:01:44 +0200 Subject: [PATCH 1/5] ci: python -> python3 Signed-off-by: Ali Caglayan --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be897505df4..0fafd68f5f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,7 +133,7 @@ jobs: endGroup echo "::remove-matcher owner=coq-problem-matcher::" # remove problem matcher installed by Coq docker action, so we don't get duplicate warning annotations sudo apt-get -o Acquire::Retries=30 update -q - sudo apt-get -o Acquire::Retries=30 install python -y --allow-unauthenticated + sudo apt-get -o Acquire::Retries=30 install python3 -y --allow-unauthenticated etc/coq-scripts/github/reportify-coq.sh --errors ${{ matrix.extra-gh-reportify }} make TIMED=1 -j2 --output-sync - name: Revert permissions @@ -375,7 +375,7 @@ jobs: ocaml_version: ${{ env.ocaml-version }} custom_script: | sudo apt-get update - sudo apt-get install -y time python lua5.1 + sudo apt-get install -y time python3 lua5.1 startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions sudo chown -R coq:coq . endGroup From faab9404c6f328a1fd7f785ae914e7b9bac5325e Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Tue, 30 Jul 2024 19:19:33 +0200 Subject: [PATCH 2/5] ci: try to create a virtual python environment for alectryon job Signed-off-by: Ali Caglayan --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fafd68f5f1..39c35eca0b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,7 +203,12 @@ jobs: opam install -y coq-serapi sudo apt-get -o Acquire::Retries=30 update -q sudo apt-get -o Acquire::Retries=30 install python3-pip autoconf -y --allow-unauthenticated - python3 -m pip install --user --upgrade pygments dominate beautifulsoup4 docutils==0.17.1 + # Create and activate a virtual environment + python3 -m venv myenv + source myenv/bin/activate + # Install the required Python packages in the virtual environment + python -m pip install --upgrade pip + python -m pip install pygments dominate beautifulsoup4 docutils==0.17.1 startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions sudo chown -R coq:coq . endGroup From d2bed00a42d75504230419b493fe9886e0925bc2 Mon Sep 17 00:00:00 2001 From: Dan Christensen Date: Tue, 30 Jul 2024 15:45:51 -0400 Subject: [PATCH 3/5] ci: move workaround for permissions earlier --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39c35eca0b3..5e8efa773c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,15 +203,15 @@ jobs: opam install -y coq-serapi sudo apt-get -o Acquire::Retries=30 update -q sudo apt-get -o Acquire::Retries=30 install python3-pip autoconf -y --allow-unauthenticated + startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions + sudo chown -R coq:coq . + endGroup # Create and activate a virtual environment python3 -m venv myenv source myenv/bin/activate # Install the required Python packages in the virtual environment python -m pip install --upgrade pip python -m pip install pygments dominate beautifulsoup4 docutils==0.17.1 - startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions - sudo chown -R coq:coq . - endGroup echo "::remove-matcher owner=coq-problem-matcher::" # remove problem matcher installed by Coq docker action, so we don't get duplicate warning annotations make alectryon ALECTRYON_EXTRAFLAGS=--traceback - name: Revert permissions From 7c4f68576100a93843ba653c9b5139b3dbde0ceb Mon Sep 17 00:00:00 2001 From: Dan Christensen Date: Tue, 30 Jul 2024 19:47:05 -0400 Subject: [PATCH 4/5] Install python-is-python3 Co-authored-by: Jason Gross --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e8efa773c9..25fc56ac472 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,7 +133,7 @@ jobs: endGroup echo "::remove-matcher owner=coq-problem-matcher::" # remove problem matcher installed by Coq docker action, so we don't get duplicate warning annotations sudo apt-get -o Acquire::Retries=30 update -q - sudo apt-get -o Acquire::Retries=30 install python3 -y --allow-unauthenticated + sudo apt-get -o Acquire::Retries=30 install python3 python-is-python3 -y --allow-unauthenticated etc/coq-scripts/github/reportify-coq.sh --errors ${{ matrix.extra-gh-reportify }} make TIMED=1 -j2 --output-sync - name: Revert permissions @@ -380,7 +380,7 @@ jobs: ocaml_version: ${{ env.ocaml-version }} custom_script: | sudo apt-get update - sudo apt-get install -y time python3 lua5.1 + sudo apt-get install -y time python3 python-is-python3 lua5.1 startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions sudo chown -R coq:coq . endGroup From e5ea9cfffde80b12ac5e37b297ceac4810bab2e5 Mon Sep 17 00:00:00 2001 From: Dan Christensen Date: Tue, 30 Jul 2024 19:48:16 -0400 Subject: [PATCH 5/5] ci: install python3-venv --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25fc56ac472..f447f0e6d9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -202,7 +202,7 @@ jobs: custom_script: | opam install -y coq-serapi sudo apt-get -o Acquire::Retries=30 update -q - sudo apt-get -o Acquire::Retries=30 install python3-pip autoconf -y --allow-unauthenticated + sudo apt-get -o Acquire::Retries=30 install python3-pip python3-venv autoconf -y --allow-unauthenticated startGroup "Workaround permission issue" # https://github.com/coq-community/docker-coq-action#permissions sudo chown -R coq:coq . endGroup