timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 19:40:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baptiste Augrain
2024-10-23 11:22:55 +02:00
parent 4418bab702
commit 33a2643e1b
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/insider-windows.yml vendored
View File

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

2
.github/workflows/stable-windows.yml vendored
View File

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

15
patches/linux/fix-build.patch
View File

@@ -46,17 +46,4 @@ index 3163aee..dca1845 100644
- files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
+ // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
// Add the main executable. // 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

9
patches/linux/rpm.patch
View File

@@ -1,9 +1,14 @@
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template 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 --- a/resources/linux/rpm/code.spec.template
+++ b/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template
@@ -2,3 +2,3 @@ Name: @@NAME@@ @@ -2,3 +2,3 @@ Name: @@NAME@@
Version: @@VERSION@@ Version: @@VERSION@@
-Release: @@RELEASE@@.el8 -Release: @@RELEASE@@.el8
+Release: el8 +Release: el9
Summary: Code editing. Redefined. 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