浏览代码

fix: migrate from el9 to el8 (#2350)

Baptiste Augrain 1 月之前
父节点
当前提交
125e424d8d
共有 3 个文件被更改,包括 22 次插入24 次删除
  1. 1 1
      patches/linux/rpm.patch
  2. 18 20
      patches/update-electron.patch
  3. 3 3
      release_notes.txt

+ 1 - 1
patches/linux/rpm.patch

@@ -5,7 +5,7 @@ index a73bc02..242bab0 100644
 @@ -2,3 +2,3 @@ Name:     @@NAME@@
  Version:  @@VERSION@@
 -Release:  @@RELEASE@@.el8
-+Release:  el9
++Release:  el8
  Summary:  Code editing. Redefined.
 @@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
  %{_datadir}/zsh/site-functions/_%{name}

+ 18 - 20
patches/update-electron.patch

@@ -2,13 +2,11 @@ diff --git a/.npmrc b/.npmrc
 index 71d98e6..b568b8e 100644
 --- a/.npmrc
 +++ b/.npmrc
-@@ -1,5 +1,5 @@
+@@ -1,3 +1,3 @@
  disturl="https://electronjs.org/headers"
 -target="34.3.2"
 +target="34.3.3"
  ms_build_id="11161073"
- runtime="electron"
- build_from_source="true"
 diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
 index d390d7a..fd80964 100644
 --- a/build/checksums/electron.txt
@@ -164,22 +162,30 @@ index d390d7a..fd80964 100644
 +ff58fe3b53681970e58acaca92c3e3f0a9586c3a262350bad973910792bd779c *mksnapshot-v34.3.3-win32-arm64-x64.zip
 +df40ee34d993c7dc171c5b953cbdd88d9c1eadd258d2dba566c0ef315a2143ab *mksnapshot-v34.3.3-win32-ia32.zip
 +cde7f12a9e271ee300c0f515b61d7cfb8a9ee62b4804a28f8f330f4d85047f68 *mksnapshot-v34.3.3-win32-x64.zip
+diff --git a/cgmanifest.json b/cgmanifest.json
+index eb5b37d..23dc982 100644
+--- a/cgmanifest.json
++++ b/cgmanifest.json
+@@ -530,3 +530,3 @@
+ 					"repositoryUrl": "https://github.com/electron/electron",
+-					"commitHash": "f98501308a973e0aee2414315b426e5de2c03a60"
++					"commitHash": "ac5b5995e85e6f0b9bf5e82ff6df20d52c7d56bc"
+ 				}
+@@ -535,3 +535,3 @@
+ 			"license": "MIT",
+-			"version": "34.3.2"
++			"version": "34.3.3"
+ 		},
 diff --git a/package-lock.json b/package-lock.json
 index 21f43a6..2108ce1 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -97,7 +97,7 @@
-         "cssnano": "^6.0.3",
-         "debounce": "^1.0.0",
+@@ -99,3 +99,3 @@
          "deemon": "^1.8.0",
 -        "electron": "34.3.2",
 +        "electron": "34.3.3",
          "eslint": "^9.11.1",
-         "eslint-formatter-compact": "^8.40.0",
-         "eslint-plugin-header": "3.1.1",
-@@ -6112,9 +6112,9 @@
-       "dev": true
-     },
+@@ -6114,5 +6114,5 @@
      "node_modules/electron": {
 -      "version": "34.3.2",
 -      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz",
@@ -188,20 +194,12 @@ index 21f43a6..2108ce1 100644
 +      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.3.tgz",
 +      "integrity": "sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ==",
        "dev": true,
-       "hasInstallScript": true,
-       "license": "MIT",
 diff --git a/package.json b/package.json
 index b83ddd9..2ff7586 100644
 --- a/package.json
 +++ b/package.json
-@@ -156,7 +156,7 @@
-     "cssnano": "^6.0.3",
-     "debounce": "^1.0.0",
+@@ -158,3 +158,3 @@
      "deemon": "^1.8.0",
 -    "electron": "34.3.2",
 +    "electron": "34.3.3",
      "eslint": "^9.11.1",
-     "eslint-formatter-compact": "^8.40.0",
-     "eslint-plugin-header": "3.1.1",
--- 
-2.49.0

+ 3 - 3
release_notes.txt

@@ -58,7 +58,7 @@ RELEASE_NOTES
   </tr>
   <tr>
     <td>.rpm</td>
-    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.x86_64.rpm">codium-RELEASE_VERSION-el9.x86_64.rpm</a></td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el8.x86_64.rpm">codium-RELEASE_VERSION-el8.x86_64.rpm</a></td>
   </tr>
   <tr>
     <td>.tar.gz</td>
@@ -134,7 +134,7 @@ RELEASE_NOTES
   </tr>
   <tr>
     <td>.rpm</td>
-    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.aarch64.rpm">codium-RELEASE_VERSION-el9.aarch64.rpm</a></td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el8.aarch64.rpm">codium-RELEASE_VERSION-el8.aarch64.rpm</a></td>
   </tr>
   <tr>
     <td>.tar.gz</td>
@@ -173,7 +173,7 @@ RELEASE_NOTES
   </tr>
   <tr>
     <td>.rpm</td>
-    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el9.armv7hl.rpm">codium-RELEASE_VERSION-el9.armv7hl.rpm</a></td>
+    <td><a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/codium-RELEASE_VERSION-el8.armv7hl.rpm">codium-RELEASE_VERSION-el8.armv7hl.rpm</a></td>
   </tr>
   <tr>
     <td>.tar.gz</td>