Merge branch 'main' into rotor

cksystemsteaching · May 3, 2024 · cff4117 · cff4117
2 parents 35e9a50 + cfb3bf8
commit cff4117
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/grader.yml b/.github/workflows/grader.yml
@@ -57,11 +57,11 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
-    - name: Use Python 3.7.x
-      uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - name: Use Python 3.12.x
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.7.x"
+        python-version: "3.12.x"
     # extract assignment from "commit message [assignment]"
     - name: Parse commit message
       run: echo "ASSIGNMENT=$(echo $COMMIT_MESSAGE | awk -F '[][]' '{print $2}')" >> $GITHUB_ENV
@@ -79,11 +79,11 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
-    - name: Use Python 3.7.x
-      uses: actions/setup-python@v4
+      uses: actions/checkout@v4
+    - name: Use Python 3.12.x
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.7.x"
+        python-version: "3.12.x"
     # extract assignment from "commit message [assignment]"
     - name: Parse commit message
       run: echo "ASSIGNMENT=$(echo $COMMIT_MESSAGE | awk -F '[][]' '{print $2}')" >> $GITHUB_ENV

diff --git a/.github/workflows/selfie.yml b/.github/workflows/selfie.yml
@@ -49,13 +49,13 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Make all
       run: make -j -O all
-    - name: Use Python 3.7.x
-      uses: actions/setup-python@v4
+    - name: Use Python 3.12.x
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.7.x"
+        python-version: "3.12.x"
     - name: Run autograder baseline
       run: make grade
 
@@ -66,13 +66,13 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Make all
       run: make -j all
-    - name: Use Python 3.7.x
-      uses: actions/setup-python@v4
+    - name: Use Python 3.12.x
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.7.x"
+        python-version: "3.12.x"
     - name: Run autograder baseline
       run: make grade
 
@@ -83,7 +83,7 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Use gcc from cygwin for LP64 data model (not LLP64 with mingw)
       run: |
         choco upgrade cygwin -y --no-progress
@@ -107,14 +107,14 @@ jobs:
 
     steps:
     - name: Checkout selfie
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
       with:
         platforms: all
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     - name: Build docker images
       run: |
         # TODO: build single multi-platform image even though arm64 does not support 32-bit tools

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@
 #####################################
 # RISCV gnu toolchain builder image #
 #####################################
-FROM ubuntu:latest AS riscvgnutoolchainbuilder
+FROM ubuntu:jammy AS riscvgnutoolchainbuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -31,7 +31,7 @@ RUN cd riscv-gnu-toolchain \
 ###################################
 # PK (Proxy kernel) builder image #
 ###################################
-FROM ubuntu:latest AS pkbuilder
+FROM ubuntu:jammy AS pkbuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -62,7 +62,7 @@ RUN mkdir -p riscv-pk/build \
 #######################################
 # Spike (ISA simulator) builder image #
 #######################################
-FROM ubuntu:latest AS spikebuilder
+FROM ubuntu:jammy AS spikebuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -88,7 +88,7 @@ RUN mkdir -p riscv-isa-sim/build \
 ######################
 # QEMU builder image #
 ######################
-FROM ubuntu:latest AS qemubuilder
+FROM ubuntu:jammy AS qemubuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -110,7 +110,7 @@ RUN mkdir -p $RISCV/bin \
 ########################################
 # Boolector (SMT solver) builder image #
 ########################################
-FROM ubuntu:latest AS boolectorbuilder
+FROM ubuntu:jammy AS boolectorbuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -145,7 +145,7 @@ RUN mkdir -p $RISCV \
 #########################
 # OpenOCD builder image #
 #########################
-FROM ubuntu:latest AS openocdbuilder
+FROM ubuntu:jammy AS openocdbuilder
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 
@@ -176,7 +176,7 @@ RUN mkdir -p $RISCV \
 ############################
 # Selfie interactive image #
 ############################
-FROM ubuntu:latest AS selfieall
+FROM ubuntu:jammy AS selfieall
 
 ENV TOP=/opt RISCV=/opt/riscv PATH=$PATH:/opt/riscv/bin
 

diff --git a/tools/quarc/requirements.txt b/tools/quarc/requirements.txt
@@ -3,7 +3,7 @@ cffi==1.15.0
 charset-normalizer==2.0.12
 cryptography==42.0.4
 dill==0.3.5.1
-idna==3.3
+idna==3.7
 mpmath==1.3.0
 ntlm-auth==1.5.0
 numpy==1.22.4

diff --git a/tools/qubot/requirements.txt b/tools/qubot/requirements.txt
@@ -59,7 +59,7 @@ prometheus-client==0.11.0
 prompt-toolkit==3.0.20
 ptyprocess==0.7.0
 pycparser==2.20
-pydantic==1.8.2
+pydantic==1.10.13
 Pygments==2.15.0
 pyparsing==2.4.7
 pyqubo==1.0.13