Downgrade wine-staging (#585)

* Update action.yml * Update reusable-build.yml * Update action.yml * Update action.yml
Washi1337 · Sep 23, 2024 · 15c11dc · 15c11dc
1 parent 2fdf836
commit 15c11dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/actions/setup-wine-ubuntu/action.yml b/.github/actions/setup-wine-ubuntu/action.yml
@@ -16,7 +16,12 @@ runs:
     - run: sudo apt-get update
       shell: bash
 
-    - run: sudo apt install --install-recommends winehq-staging=${{env.WINE_VERSION}}
+    - run: |
+        sudo apt install --install-recommends \
+        winehq-staging=${{env.WINE_VERSION}} \
+        wine-staging=${{env.WINE_VERSION}} \
+        wine-staging-i386=${{env.WINE_VERSION}} \
+        wine-staging-amd64=${{env.WINE_VERSION}}
       shell: bash
       env:  
         WINE_VERSION: 9.17~jammy-1

diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -48,7 +48,7 @@ jobs:
             let gitHash = "${{ steps.git-vars.outputs.git_hash }}";
             let rawGitRef = "${{ steps.git-vars.outputs.git_branch }}";
             console.log("rawGitRef: " + rawGitRef);
-            let gitRef = rawGitRef.replace(/^refs\/heads\//, "").replace(/^refs\/heads\//, "").replace(/[//!@#$%&]/g, "_");
+            let gitRef = rawGitRef.replace(/^refs\/heads\//, "").replace(/^refs\/heads\//, "").replace(/[_//!@#$%&]/g, "-");
             if(gitRef.indexOf("refs/pull/") === 0) {
               gitRef = "pr-" + gitRef.substring(10, gitRef.lastIndexOf("/"));
             }
@@ -94,4 +94,4 @@ jobs:
         with:
           image: ${{inputs.image}}
           architecture: ${{inputs.architecture}}
-          build_configuration: ${{inputs.build_configuration}}
+          build_configuration: ${{inputs.build_configuration}}