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

beh-10257 · Oct 22, 2024 · 6e17560 · 6e17560
2 parents bb4d571 + 56f8e12
commit 6e17560
Show file tree

Hide file tree

Showing 13 changed files with 563 additions and 161 deletions.
diff --git a/.github/workflows/build-umu-debian-12.yml b/.github/workflows/build-umu-debian-12.yml
@@ -4,6 +4,8 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -15,7 +17,7 @@ jobs:
       options: --privileged -it
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Copy debian packaging folder to the repository root
       run: cp -rvf ./packaging/deb/debian ./debian
@@ -41,5 +43,5 @@ jobs:
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: Binary DEB files
+        name: Debian-12
         path: results/
diff --git a/.github/workflows/build-umu-fedora.yml b/.github/workflows/build-umu-fedora.yml
@@ -5,6 +5,8 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -17,7 +19,7 @@ jobs:
       run: dnf install -y git
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Configure Git safe directory
       run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -33,7 +35,7 @@ jobs:
         cp -r . ~/rpmbuild/SOURCES/umu-launcher
         rpmbuild -ba packaging/rpm/umu-launcher.spec
 
-    - name: Upload RPM
+    - name: Fedora-40
       uses: actions/[email protected]
       with:
         name: umu-launcher-rpm

diff --git a/.github/workflows/build-umu-ubuntu-noble.yml b/.github/workflows/build-umu-ubuntu-noble.yml
@@ -4,6 +4,8 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -15,7 +17,7 @@ jobs:
       options: --privileged -it
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Copy debian packaging folder to the repository root
       run: cp -rvf ./packaging/deb/ubuntu ./debian
@@ -41,5 +43,5 @@ jobs:
     - name: Upload artifact
       uses: actions/[email protected]
       with:
-        name: Binary DEB files
+        name: Ubuntu-24
         path: results/
diff --git a/.github/workflows/build-umu-zipapp.yml b/.github/workflows/build-umu-zipapp.yml
@@ -0,0 +1,44 @@
+name: UMU Zipapp Build
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: debian:bookworm
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Update APT Cache
+      run: apt update -y
+
+    - name: Install build dependencies
+      run: apt install -y python3-venv python3-all bash make scdoc python3-hatchling python3-installer python3-build
+
+    - name: Configure
+      run: ./configure.sh --user-install
+
+    - name: Build
+      run: make all
+
+    - name: Move DEB files to upload artifact path
+      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 ..
+
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: Zipapp
+        path: results/
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -0,0 +1,83 @@
+name: Create Release
+
+on:
+  release:
+    types: [published]  # Trigger when a new release is published
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download Debian 12 Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: Debian-12
+
+      - name: Download Ubuntu 24 Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: Ubuntu-24
+
+      - name: Download Fedora RPM Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: umu-launcher-rpm
+
+      - name: Download Zipapp Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: Zipapp
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.release.tag_name }}
+          release_name: ${{ github.event.release.name }}
+          draft: false
+          prerelease: false
+
+      - name: Upload Debian 12 Artifact to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: results/*.deb
+          asset_name: Debian-12.deb
+          asset_content_type: application/octet-stream
+
+      - name: Upload Ubuntu 24 Artifact to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: results/*.deb
+          asset_name: Ubuntu-24.deb
+          asset_content_type: application/octet-stream
+
+      - name: Upload Fedora RPM Artifact to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ~/rpmbuild/RPMS/noarch/*.rpm
+          asset_name: umu-launcher-rpm.rpm
+          asset_content_type: application/octet-stream
+
+      - name: Upload Zipapp Artifact to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: results/umu-run
+          asset_name: umu-run.zip
+          asset_content_type: application/octet-stream
diff --git a/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml b/packaging/flatpak/org.openwinecomponents.umu.umu-launcher.yml
@@ -26,10 +26,6 @@ finish-args:
   - --filesystem=~/Games:rw
   - --filesystem=~/.local/share/Steam:rw
   - --filesystem=~/.var/app/com.valvesoftware.Steam:rw
-  - --filesystem=~/.var/app/org.openwinecomponents.umu.umu-launcher:rw
-  - --filesystem=home
-  - --filesystem=xdg-documents
-  - --filesystem=xdg-desktop
   - --filesystem=xdg-download
   - --env=TZ=
   - --unset-env=TZ

diff --git a/packaging/nix/umu-launcher.nix b/packaging/nix/umu-launcher.nix
@@ -10,7 +10,14 @@ python3Packages.buildPythonPackage {
     pkgs.scdoc
     pkgs.git
     pkgs.python3Packages.installer
-    pkgs.hatch
+    (pkgs.hatch.overrideAttrs (prev: {
+      disabledTests = prev.disabledTests ++ [
+        "test_field_readme"
+        "test_field_string"
+        "test_field_complex"
+        "test_plugin_dependencies_unmet"
+      ];
+    }))
     pkgs.python3Packages.build
   ];
   propagatedBuildInputs = [

diff --git a/tests/test_update.sh b/tests/test_update.sh
@@ -6,6 +6,7 @@ curl -LJO "https://repo.steampowered.com/steamrt3/images/0.20240916.101795/Steam
 tar xaf SteamLinuxRuntime_sniper.tar.xz
 mv SteamLinuxRuntime_sniper/* "$HOME/.local/share/umu"
 mv "$HOME/.local/share/umu/_v2-entry-point" "$HOME/.local/share/umu/umu"
+echo "$@" > "$HOME/.local/share/umu/umu-shim" && chmod 700 "$HOME/.local/share/umu/umu-shim"
 
 # Perform a preflight step, where we ensure everything is in order and create '$HOME/.local/share/umu/var'
 # Afterwards, run a 2nd time to perform the runtime update and ensure '$HOME/.local/share/umu/var' is removed

diff --git a/umu/umu_consts.py b/umu/umu_consts.py
@@ -7,6 +7,8 @@
     ".local", "share", "Steam", "compatibilitytools.d"
 )
 
+STEAM_WINDOW_ID: int = 769
+
 PROTON_VERBS = {
     "waitforexitandrun",
     "run",