feat: update to 1.78 (#1500)

VSCodium · May 10, 2023 · 7afbfe0 · 7afbfe0
1 parent 94ab319
commit 7afbfe0
Show file tree

Hide file tree

Showing 22 changed files with 3,714 additions and 2,242 deletions.
diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
@@ -87,7 +87,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -131,10 +131,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -159,7 +159,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         env:

diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh

diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -128,10 +128,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -154,7 +154,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh

diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.14.2
+16.17
diff --git a/announcements-extra.json b/announcements-extra.json
@@ -1,12 +1,2 @@
 [
-  {
-    "id": "#1495",
-    "title": "🗳️ [Icon][Linux] Finale Poll",
-    "url": "https://github.com/VSCodium/vscodium/discussions/1495"
-  },
-  {
-    "id": "#1496",
-    "title": "🗳️ [Icon][Windows] Finale Poll",
-    "url": "https://github.com/VSCodium/vscodium/discussions/1496"
-  }
 ]
diff --git a/icons/build_icons.sh b/icons/build_icons.sh
@@ -6,11 +6,13 @@ set -e
 # set -o xtrace
 
 QUALITY="stable"
+COLOR="blue1"
 
 while getopts ":i" opt; do
   case "$opt" in
     i)
       export QUALITY="insider"
+      export COLOR="orange1"
       ;;
   esac
 done
@@ -75,11 +77,7 @@ build_darwin_types() { # {{{
 
 build_linux_main() { # {{{
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" ]; then
-    convert -size 1024x1024 canvas:transparent PNG32:"code_1024.png"
-    rsvg-convert -w 846 -h 824 "icons/${QUALITY}/codium_clt.svg" -o "code_logo.png"
-    composite "code_logo.png" -gravity center -background none "code_1024.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
-
-    rm code_1024.png code_logo.png
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/linux/circle1/${COLOR}/paulo22s.png" -O "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
   fi
 
   mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm"
@@ -98,10 +96,7 @@ build_media() { # {{{
 
 build_windows_main() { # {{{
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
-    rsvg-convert -w 1024 -h 1024 "icons/${QUALITY}/codium_clt.svg" -o "code_logo.png"
-    convert "code_logo.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
-
-    rm code_logo.png
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/win32/nobg/${COLOR}/paulo22s.ico" -O "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
   fi
 } # }}}