Add back setup python step.

kuznia-rdzeni · Oct 14, 2023 · 8ca2be3 · 8ca2be3
1 parent be694e7
commit 8ca2be3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -23,6 +23,15 @@ jobs:
           # https://github.com/actions/runner/issues/2033
           chown -R $(id -u):$(id -g) $PWD
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+
       - name: Install dependencies
         run: |
           python3 -m pip install --break-system-packages --upgrade pip
@@ -84,6 +93,15 @@ jobs:
           # https://github.com/actions/runner/issues/2033
           chown -R $(id -u):$(id -g) $PWD
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+
       - name: Install dependencies
         run: |
           python3 -m pip install --break-system-packages --upgrade pip

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,6 +41,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+
       - name: Install dependencies
         run: |
           python3 -m pip install --break-system-packages --upgrade pip

diff --git a/docker/riscv-toolchain.Dockerfile b/docker/riscv-toolchain.Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:23.04
+FROM ubuntu:23.10
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
-    autoconf automake autotools-dev curl python3 bc lsb-release \
+    autoconf automake autotools-dev curl python3 python3-pip bc lsb-release \
     libmpc-dev libmpfr-dev libgmp-dev gawk build-essential \
     bison flex texinfo gperf libtool patchutils zlib1g-dev \
     libexpat-dev ninja-build git ca-certificates python-is-python3 && \