Merge branch 'main' into wine-b-gone

Author: mkst

.env

@@ -8,3 +8,4 @@ GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 FRONTEND_USE_IMAGE_PROXY=true
 FRONTEND_PWA=off
+SESSION_COOKIE_AGE=7776000

.github/workflows/ci.yml

@@ -7,9 +7,9 @@ on:
 jobs:
   full_test_and_build:
     name: full test and build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install poetry
         run: pipx install poetry
@@ -26,7 +26,7 @@ jobs:
           sudo dpkg --add-architecture i386
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update -qq
-          sudo apt-get purge -yqq libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
+          sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386 wine
 
           sudo apt-get install \
             ca-certificates \
@@ -45,17 +45,22 @@ jobs:
             binutils-aarch64-linux-gnu \
             binutils-mips-linux-gnu \
             binutils-powerpc-linux-gnu \
+            binutils-sh-elf \
             dos2unix \
             libprotobuf-dev \
             libnl-route-3-dev \
             libncurses5 \
-            protobuf-compiler \
-            wine
+            protobuf-compiler
       - name: Install apt dependencies (cached)
         uses: awalsh128/cache-apt-pkgs-action@v1
         with:
-          packages: docker-ce docker-ce-cli containerd.io docker-compose-plugin binutils-aarch64-linux-gnu binutils-mips-linux-gnu binutils-powerpc-linux-gnu dos2unix libprotobuf-dev libnl-route-3-dev libncurses5 protobuf-compiler wine
+          packages: docker-ce docker-ce-cli containerd.io docker-compose-plugin binutils-aarch64-linux-gnu binutils-mips-linux-gnu binutils-powerpc-linux-gnu binutils-sh-elf dos2unix libprotobuf-dev libnl-route-3-dev libncurses5 protobuf-compiler wine software-properties-common
           version: 1.0
+      - name: Install DOSEMU
+        run: |-
+          sudo add-apt-repository -y ppa:dosemu2/ppa
+          sudo apt-get update
+          sudo apt-get install -y dosemu2
       - name: Install nsjail
         run: |-
           git clone --recursive --branch=3.1 https://github.com/google/nsjail
@@ -127,7 +132,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install poetry
         run: pipx install poetry
       - name: Setup Python 3.9
@@ -151,13 +156,14 @@ jobs:
     name: backend tests (docker)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build decompme_backend image
         run: |-
           docker build backend \
             -t decompme_backend \
             --build-arg ENABLE_WII_GC_SUPPORT=YES \
-            --build-arg ENABLE_PS1_SUPPORT=YES
+            --build-arg ENABLE_PS1_SUPPORT=YES \
+            --build-arg ENABLE_SATURN_SUPPORT=YES
       - name: Run tests
         run: |-
           mkdir -p sandbox && chmod 777 sandbox
@@ -182,7 +188,7 @@ jobs:
     name: eslint & stylelint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Node.js 18
         uses: actions/setup-node@v3
         with:
@@ -197,7 +203,7 @@ jobs:
     name: mypy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install poetry
         run: pipx install poetry
       - name: Setup Python 3.9
@@ -215,7 +221,7 @@ jobs:
     name: black
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: psf/black@stable
         with:
           src: "./backend"

backend/Dockerfile

@@ -1,13 +1,13 @@
-FROM ubuntu:20.04 as base
+FROM ubuntu:22.04 as base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \
     python3-pip \
     python3 \
     python-is-python3 \
-    python3.9-venv \
-    python3.9-dev
+    python3.10-venv \
+    python3.10-dev
 
 
 FROM base AS nsjail
@@ -37,6 +37,7 @@ RUN apt-get -y update && apt-get install -y \
     binutils-mips-linux-gnu \
     binutils-powerpc-linux-gnu \
     binutils-aarch64-linux-gnu \
+    binutils-sh-elf \
     curl \
     gcc-mips-linux-gnu \
     git \
@@ -50,7 +51,7 @@ RUN apt-get -y update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | \
-  POETRY_VERSION=1.3.1 POETRY_HOME=/etc/poetry python3.9 -
+  POETRY_VERSION=1.3.1 POETRY_HOME=/etc/poetry python3.10 -
 
 COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
@@ -60,6 +61,7 @@ COPY --from=ghcr.io/decompals/wibo:0.4.1 /usr/local/sbin/wibo /usr/bin/
 ARG ENABLE_NDS_SUPPORT
 ARG ENABLE_PS1_SUPPORT
 ARG ENABLE_WII_GC_SUPPORT
+ARG ENABLE_SATURN_SUPPORT
 RUN if [ "${ENABLE_NDS_SUPPORT}" = "YES" ] || \
        [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
        [ "${ENABLE_WII_GC_SUPPORT}" = "YES" ]; then \
@@ -68,9 +70,15 @@ RUN if [ "${ENABLE_NDS_SUPPORT}" = "YES" ] || \
         wine; \
     fi
 
-# ps1 specifics
-RUN if [ "${ENABLE_PS1_SUPPORT}" = "YES" ] ; then \
-    apt-get install -y dos2unix; \
+# install dos2unix and dosemu2 for ps1 and saturn
+RUN if [ "${ENABLE_PS1_SUPPORT}" = "YES" ] || \
+       [ "${ENABLE_SATURN_SUPPORT}" = "YES" ]; then \
+    apt-get update && \
+    apt-get install -y -o APT::Immediate-Configure=false \
+        dos2unix software-properties-common && \
+    add-apt-repository -y ppa:dosemu2/ppa && \
+    apt-get update && \
+    apt-get install -y dosemu2; \
     fi
 
 # gc/wii specifics
@@ -92,9 +100,10 @@ ENV ENABLE_N64_SUPPORT=${ENABLE_N64_SUPPORT}
 ENV ENABLE_NDS_SUPPORT=${ENABLE_NDS_SUPPORT}
 ENV ENABLE_PS1_SUPPORT=${ENABLE_PS1_SUPPORT}
 ENV ENABLE_SWITCH_SUPPORT=${ENABLE_SWITCH_SUPPORT}
+ENV ENABLE_SATURN_SUPPORT=${ENABLE_SATURN_SUPPORT}
 
-RUN python3.9 -m pip install requests tqdm \
-    && python3.9 /compilers/download.py \
+RUN python3.10 -m pip install requests tqdm \
+    && python3.10 /compilers/download.py \
     && rm -rf /compilers/download_cache/
 
 RUN mkdir -p /etc/fonts