fix: correct rpm patch and increase signing timeout [skip ci]

VSCodium · Oct 23, 2024 · 33a2643 · 33a2643
1 parent 4418bab
commit 33a2643
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml
@@ -120,6 +120,8 @@ jobs:
           github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
           artifact-configuration-slug: ${{ matrix.vscode_arch }}
           wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
           output-artifact-directory: assets/
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 

diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml
@@ -119,6 +119,8 @@ jobs:
           github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
           artifact-configuration-slug: ${{ matrix.vscode_arch }}
           wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
           output-artifact-directory: assets/
         if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
 

diff --git a/patches/linux/fix-build.patch b/patches/linux/fix-build.patch
@@ -46,17 +46,4 @@ index 3163aee..dca1845 100644
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  	// Add the main executable.
-diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index a73bc02..242bab0 100644
---- a/resources/linux/rpm/code.spec.template
-+++ b/resources/linux/rpm/code.spec.template
-@@ -2,3 +2,3 @@ Name:     @@NAME@@
- Version:  @@VERSION@@
--Release:  @@RELEASE@@.el8
-+Release:  @@RELEASE@@.el9
- Summary:  Code editing. Redefined.
-@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
- %{_datadir}/zsh/site-functions/_%{name}
-+
-+%config(noreplace) /usr/share/%{name}/resources/app/product.json
-\ No newline at end of file
+
diff --git a/patches/linux/rpm.patch b/patches/linux/rpm.patch
@@ -1,9 +1,14 @@
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index c9e57db..ef27166 100644
+index a73bc02..242bab0 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
 @@ -2,3 +2,3 @@ Name:     @@NAME@@
  Version:  @@VERSION@@
 -Release:  @@RELEASE@@.el8
-+Release:  el8
++Release:  el9
  Summary:  Code editing. Redefined.
+@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
+ %{_datadir}/zsh/site-functions/_%{name}
++
++%config(noreplace) /usr/share/%{name}/resources/app/product.json
+\ No newline at end of file