Merge branch 'Open-Wine-Components:main' into main

beh-10257 · Dec 6, 2024 · bbf783e · bbf783e
2 parents f682f5f + 1c3dd94
commit bbf783e
Show file tree

Hide file tree

Showing 42 changed files with 2,534 additions and 1,529 deletions.
diff --git a/.github/workflows/build-umu-debian-12.yml b/.github/workflows/build-umu-debian-12.yml
@@ -29,7 +29,7 @@ jobs:
       run: apt install -y dh-make dpkg-dev
 
     - name: Setup dh_make quilt files
-      run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.3 || true
+      run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.4 || true
 
     - name: Install apt build dependencies
       run: apt build-dep -y ./ 

diff --git a/.github/workflows/build-umu-fedora.yml → .github/workflows/build-umu-fedora-40.yml b/.github/workflows/build-umu-fedora.yml → .github/workflows/build-umu-fedora-40.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: fedora:latest
+      image: fedora:40
 
     steps:
     - name: Install Git
@@ -38,5 +38,5 @@ jobs:
     - name: Fedora-40
       uses: actions/[email protected]
       with:
-        name: umu-launcher-rpm
+        name: umu-launcher-rpm-40
         path: ~/rpmbuild/RPMS/noarch/*.rpm
diff --git a/.github/workflows/build-umu-fedora-41.yml b/.github/workflows/build-umu-fedora-41.yml
@@ -0,0 +1,42 @@
+name: UMU RPM Build - Fedora/Nobara
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:41
+
+    steps:
+    - name: Install Git
+      run: dnf install -y git
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Configure Git safe directory
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+    - name: Install build dependencies
+      run: dnf install -y rpm-build meson ninja-build cmake g++ gcc-c++ scdoc git python3-devel python3-build python3-installer python3-hatchling python python3
+
+    - name: Build the project
+      run: |
+        ./configure.sh --prefix=/usr
+        make
+        mkdir -p ~/rpmbuild/SOURCES
+        cp -r . ~/rpmbuild/SOURCES/umu-launcher
+        rpmbuild -ba packaging/rpm/umu-launcher.spec
+
+    - name: Fedora-41
+      uses: actions/[email protected]
+      with:
+        name: umu-launcher-rpm-41
+        path: ~/rpmbuild/RPMS/noarch/*.rpm
diff --git a/.github/workflows/build-umu-ubuntu-noble.yml b/.github/workflows/build-umu-ubuntu-noble.yml
@@ -29,7 +29,7 @@ jobs:
       run: apt install -y dh-make dpkg-dev
 
     - name: Setup dh_make quilt files
-      run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.3 || true
+      run: LOGNAME=root dh_make --createorig -y -l -p umu-launcher_1.1.4 || true
 
     - name: Install apt build dependencies
       run: apt build-dep -y ./ 

diff --git a/.github/workflows/build-umu-zipapp.yml b/.github/workflows/build-umu-zipapp.yml
@@ -35,10 +35,12 @@ jobs:
       run: mkdir -p results && cp -rvf builddir/umu-run results/
 
     - name: Create symlink for launchers
-      run: cd results && ln -s umu-run umu_run.py && cd ..
+      # To preserve file mode bits and link file, use a tar archive.
+      # See https://github.com/actions/upload-artifact?tab=readme-ov-file#permission-loss
+      run: cd results && ln -s umu-run umu_run.py && tar cvf Zipapp.tar umu-run umu_run.py
 
     - name: Upload artifact
       uses: actions/[email protected]
       with:
         name: Zipapp
-        path: results/
+        path: results/Zipapp.tar
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -2,9 +2,9 @@ name: e2e
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 permissions:
   contents: read
@@ -14,37 +14,58 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Install dependencies
-      run: |
-        sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock shellcheck
-        python3 -m pip install --upgrade pip
-        pip install uv
-    - name: Initialize submodules
-      run: |
-        git submodule update --init --recursive
-    - name: Make user install
-      run: |
-        ./configure.sh --user-install
-        make install
-    - name: Run shellcheck
-      run: |
-        shellcheck tests/*.sh
-    - name: Test steamrt install
-      run: |
-        sh tests/test_install.sh
-        rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
-    - name: Test steamrt update
-      run: |
-        sh tests/test_update.sh
-        rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
-    - name: Test winetricks
-      run: |
-        sh tests/test_winetricks.sh
-        rm -rf "$HOME/.local/share/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
-    - name: Test configuration file
-      run: |
-        uv python install 3.11
-        uv run --python 3.11 -- sh tests/test_config.sh
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        run: |
+          sudo apt-get install meson scdoc python3-hatchling python3-build python3-installer python3-filelock shellcheck bubblewrap
+          python3 -m pip install --upgrade pip
+          pip install uv
+      - name: Initialize submodules
+        run: |
+          git submodule update --init --recursive
+      - name: Make user install
+        run: |
+          ./configure.sh --user-install
+          make install
+      - name: Run shellcheck
+        run: |
+          shellcheck tests/*.sh
+      - name: Setup venv
+        run: |
+          uv venv --python 3.11
+      - name: Test steamrt install
+        run: |
+          source .venv/bin/activate
+          sh tests/test_install.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
+      - name: Test steamrt update
+        run: |
+          source .venv/bin/activate
+          sh tests/test_update.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
+      - name: Test steamrt resume
+        run: |
+          source .venv/bin/activate
+          sh tests/test_resume.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d" "$HOME/.cache/umu"
+      - name: Test Proton resume
+        run: |
+          source .venv/bin/activate
+          sh tests/test_proton_resume.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d" "$HOME/.cache/umu"
+      - name: Test winetricks
+        run: |
+          source .venv/bin/activate
+          sh tests/test_winetricks.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/.local/share/Steam/compatibilitytools.d"
+      - name: Test configuration file
+        run: |
+          source .venv/bin/activate
+          sh tests/test_config.sh
+          rm -rf "$HOME/.local/share/umu" "$HOME/Games/umu" "$HOME/.local/share/Steam/compatibilitytools.d" "$HOME/.cache/umu"
+      - name: Test offline launch
+        run: |
+          source .venv/bin/activate
+          sh tests/test_offline.sh
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -2,9 +2,9 @@ name: mypy
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 permissions:
   contents: read
@@ -13,20 +13,25 @@ jobs:
   build:
     strategy:
       matrix:
-        version: ["3.10"]
+        version: ["3.11"]
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.version }}
-    - name: Install dependencies
-      run: |
-        python3 -m pip install --upgrade pip
-    - name: Check types with mypy
-      run: |
-        pip install mypy
-        mypy .
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.version }}
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip uv mypy
+      - name: Setup venv
+        run: |
+          uv venv --python 3.11
+          source .venv/bin/activate
+          uv pip install -r requirements.in
+      - name: Check types with mypy
+        run: |
+          source .venv/bin/activate
+          mypy --python-version 3.11 .