From 0418843dd20c8aa8d3ac0b822fe5dfa7afae66a3 Mon Sep 17 00:00:00 2001 From: Vitalii Mikhailov Date: Mon, 23 Sep 2024 21:54:21 +0300 Subject: [PATCH 1/4] Update action.yml --- .github/actions/setup-wine-ubuntu/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-wine-ubuntu/action.yml b/.github/actions/setup-wine-ubuntu/action.yml index 008ee4243..b8f6425ed 100644 --- a/.github/actions/setup-wine-ubuntu/action.yml +++ b/.github/actions/setup-wine-ubuntu/action.yml @@ -16,7 +16,7 @@ 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 wine-staging=${{env.WINE_VERSION}} winehq-staging=${{env.WINE_VERSION}} shell: bash env: WINE_VERSION: 9.17~jammy-1 From 758cd30346d513aa53c8b74394bd5ec2b027e0fe Mon Sep 17 00:00:00 2001 From: Vitalii Mikhailov Date: Mon, 23 Sep 2024 22:00:21 +0300 Subject: [PATCH 2/4] Update reusable-build.yml --- .github/workflows/reusable-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 27fe05af9..280861f89 100644 --- 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}} \ No newline at end of file + build_configuration: ${{inputs.build_configuration}} From 5cd1bb14cf00d2680ed58b1ad37e0458216f620e Mon Sep 17 00:00:00 2001 From: Vitalii Mikhailov Date: Mon, 23 Sep 2024 22:10:12 +0300 Subject: [PATCH 3/4] Update action.yml --- .github/actions/setup-wine-ubuntu/action.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-wine-ubuntu/action.yml b/.github/actions/setup-wine-ubuntu/action.yml index b8f6425ed..8d058b8bd 100644 --- a/.github/actions/setup-wine-ubuntu/action.yml +++ b/.github/actions/setup-wine-ubuntu/action.yml @@ -16,7 +16,11 @@ runs: - run: sudo apt-get update shell: bash - - run: sudo apt install --install-recommends wine-staging=${{env.WINE_VERSION}} 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 From 60ea95060fe7f5c7bcb5d1d5b39658acebc45b9f Mon Sep 17 00:00:00 2001 From: Vitalii Mikhailov Date: Mon, 23 Sep 2024 22:21:15 +0300 Subject: [PATCH 4/4] Update action.yml --- .github/actions/setup-wine-ubuntu/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-wine-ubuntu/action.yml b/.github/actions/setup-wine-ubuntu/action.yml index 8d058b8bd..8226b03f7 100644 --- a/.github/actions/setup-wine-ubuntu/action.yml +++ b/.github/actions/setup-wine-ubuntu/action.yml @@ -16,7 +16,8 @@ runs: - run: sudo apt-get update shell: bash - - run: sudo apt install --install-recommends \ + - run: | + sudo apt install --install-recommends \ winehq-staging=${{env.WINE_VERSION}} \ wine-staging=${{env.WINE_VERSION}} \ wine-staging-i386=${{env.WINE_VERSION}} \