Skip to content

Commit d4b6a02

Browse files
daiyamdaiyam
committed
Merge branch 'insider'
2 parents 0179179 + c6f1000 commit d4b6a02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+394
-632
lines changed

‎.github/workflows/insider-linux.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030
ASSETS_REPOSITORY: ${{ github.repository }}-insiders
3131
BINARY_NAME: codium-insiders
3232
DISABLE_UPDATE: 'yes'
33-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
33+
GH_REPO_PATH: ${{ github.repository }}
3434
GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
3535
ORG_NAME: ${{ github.repository_owner }}
3636
OS_NAME: linux
@@ -107,10 +107,6 @@ jobs:
107107
node-version: '20.18.2'
108108
if: env.SHOULD_BUILD == 'yes'
109109

110-
- name: Install Yarn
111-
run: npm install -g yarn
112-
if: env.SHOULD_BUILD == 'yes'
113-
114110
- name: Setup Python 3
115111
uses: actions/setup-python@v5
116112
with:
@@ -541,3 +537,18 @@ jobs:
541537
repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
542538
file: ${{ steps.build.outputs.snap }}
543539
tag: ${{ env.RELEASE_VERSION }}
540+
541+
deploy-repo-dev:
542+
needs:
543+
- check
544+
- build
545+
runs-on: ubuntu-latest
546+
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
547+
548+
steps:
549+
- name: Trigger repository rebuild
550+
uses: peter-evans/repository-dispatch@v3
551+
with:
552+
token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
553+
repository: VSCodium/repositories-linux
554+
event-type: deploy

‎.github/workflows/insider-macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
ASSETS_REPOSITORY: ${{ github.repository }}-insiders
3030
BINARY_NAME: codium-insiders
3131
GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
32-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
32+
GH_REPO_PATH: ${{ github.repository }}
3333
ORG_NAME: ${{ github.repository_owner }}
3434
OS_NAME: osx
3535
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions

‎.github/workflows/insider-spearhead.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
APP_NAME: VSCodium
2626
ASSETS_REPOSITORY: ${{ github.repository }}-insiders
2727
BINARY_NAME: codium-insiders
28-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
28+
GH_REPO_PATH: ${{ github.repository }}
2929
ORG_NAME: ${{ github.repository_owner }}
3030
OS_NAME: osx
3131
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
@@ -86,5 +86,5 @@ jobs:
8686
- name: Dispatch builds
8787
uses: peter-evans/repository-dispatch@v3
8888
with:
89-
event-type: 'insider'
89+
event-type: insider
9090
if: github.event.inputs.dont_dispatch != 'true' && (env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true')

‎.github/workflows/insider-windows.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
ASSETS_REPOSITORY: ${{ github.repository }}-insiders
3030
BINARY_NAME: codium-insiders
3131
GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
32-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
32+
GH_REPO_PATH: ${{ github.repository }}
3333
ORG_NAME: ${{ github.repository_owner }}
3434
OS_NAME: windows
3535
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
@@ -105,10 +105,6 @@ jobs:
105105
node-version: '20.18.2'
106106
if: env.SHOULD_BUILD == 'yes'
107107

108-
- name: Install Yarn
109-
run: npm install -g yarn
110-
if: env.SHOULD_BUILD == 'yes'
111-
112108
- name: Setup Python 3
113109
uses: actions/setup-python@v5
114110
with:
@@ -190,10 +186,6 @@ jobs:
190186
node-version: '20.18.2'
191187
if: env.SHOULD_BUILD == 'yes'
192188

193-
- name: Install Yarn
194-
run: npm install -g yarn
195-
if: env.SHOULD_BUILD == 'yes'
196-
197189
- name: Setup Python 3
198190
uses: actions/setup-python@v5
199191
with:

‎.github/workflows/stable-linux.yml

+18-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030
ASSETS_REPOSITORY: ${{ github.repository }}
3131
BINARY_NAME: codium
3232
DISABLE_UPDATE: 'yes'
33-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
33+
GH_REPO_PATH: ${{ github.repository }}
3434
ORG_NAME: ${{ github.repository_owner }}
3535
OS_NAME: linux
3636
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
@@ -108,10 +108,6 @@ jobs:
108108
node-version: '20.18.2'
109109
if: env.SHOULD_BUILD == 'yes'
110110

111-
- name: Install Yarn
112-
run: npm install -g yarn
113-
if: env.SHOULD_BUILD == 'yes'
114-
115111
- name: Setup Python 3
116112
uses: actions/setup-python@v5
117113
with:
@@ -560,15 +556,30 @@ jobs:
560556
release: ${{ vars.SNAP_STORE_CHANNEL }}
561557
if: env.SHOULD_DEPLOY_TO_STORE == 'yes'
562558

563-
deb-rpm-repo-hook:
559+
deploy-repo-rudy:
564560
needs:
565561
- check
566562
- build
567563
runs-on: ubuntu-latest
568-
if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
564+
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
569565

570566
steps:
571567
- name: Trigger repository rebuild
572568
env:
573569
GL_PAGES_TOKEN: ${{ secrets.GL_PAGES_TOKEN }}
574570
run: curl -X POST --fail -F token="${GL_PAGES_TOKEN}" -F ref=master https://gitlab.com/api/v4/projects/8762263/trigger/pipeline
571+
572+
deploy-repo-dev:
573+
needs:
574+
- check
575+
- build
576+
runs-on: ubuntu-latest
577+
if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && github.event.inputs.generate_assets != 'true'
578+
579+
steps:
580+
- name: Trigger repository rebuild
581+
uses: peter-evans/repository-dispatch@v3
582+
with:
583+
token: ${{ secrets.STRONGER_GITHUB_TOKEN }}
584+
repository: VSCodium/repositories-linux
585+
event-type: deploy

‎.github/workflows/stable-macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
APP_NAME: VSCodium
2929
ASSETS_REPOSITORY: ${{ github.repository }}
3030
BINARY_NAME: codium
31-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
31+
GH_REPO_PATH: ${{ github.repository }}
3232
ORG_NAME: ${{ github.repository_owner }}
3333
OS_NAME: osx
3434
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions

‎.github/workflows/stable-spearhead.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
APP_NAME: VSCodium
2323
ASSETS_REPOSITORY: ${{ github.repository }}
2424
BINARY_NAME: codium
25-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
25+
GH_REPO_PATH: ${{ github.repository }}
2626
ORG_NAME: ${{ github.repository_owner }}
2727
OS_NAME: osx
2828
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
@@ -81,5 +81,5 @@ jobs:
8181
- name: Dispatch builds
8282
uses: peter-evans/repository-dispatch@v3
8383
with:
84-
event-type: 'stable'
84+
event-type: stable
8585
if: env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true'

‎.github/workflows/stable-windows.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
APP_NAME: VSCodium
2929
ASSETS_REPOSITORY: ${{ github.repository }}
3030
BINARY_NAME: codium
31-
GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
31+
GH_REPO_PATH: ${{ github.repository }}
3232
ORG_NAME: ${{ github.repository_owner }}
3333
OS_NAME: windows
3434
VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
@@ -104,10 +104,6 @@ jobs:
104104
node-version: '20.18.2'
105105
if: env.SHOULD_BUILD == 'yes'
106106

107-
- name: Install Yarn
108-
run: npm install -g yarn
109-
if: env.SHOULD_BUILD == 'yes'
110-
111107
- name: Setup Python 3
112108
uses: actions/setup-python@v5
113109
with:
@@ -189,10 +185,6 @@ jobs:
189185
node-version: '20.18.2'
190186
if: env.SHOULD_BUILD == 'yes'
191187

192-
- name: Install Yarn
193-
run: npm install -g yarn
194-
if: env.SHOULD_BUILD == 'yes'
195-
196188
- name: Setup Python 3
197189
uses: actions/setup-python@v5
198190
with:

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you want to update the existing patches, please follow the section [`Patch Up
3636
- first, you need to build VSCodium
3737
- then use the command `./dev/patch.sh <your patch name>`, to initiate a new patch
3838
- when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
39-
- run `yarn watch`
39+
- run `npm run watch`
4040
- run `./script/code.sh`
4141
- make your changes
4242
- press any key to continue the script `patch.sh`

‎build.sh

+17-14
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,32 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
1414

1515
export NODE_OPTIONS="--max-old-space-size=8192"
1616

17-
yarn monaco-compile-check
18-
yarn valid-layers-check
17+
npm run monaco-compile-check
18+
npm run valid-layers-check
1919

20-
yarn gulp compile-build
21-
yarn gulp compile-extension-media
22-
yarn gulp compile-extensions-build
23-
yarn gulp minify-vscode
20+
npm run gulp compile-build-without-mangling
21+
npm run gulp compile-extension-media
22+
npm run gulp compile-extensions-build
23+
npm run gulp minify-vscode
2424

2525
if [[ "${OS_NAME}" == "osx" ]]; then
26-
yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
26+
# generate Group Policy definitions
27+
node build/lib/policies darwin
28+
29+
npm run gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
2730

2831
find "../VSCode-darwin-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
2932

3033
VSCODE_PLATFORM="darwin"
3134
elif [[ "${OS_NAME}" == "windows" ]]; then
3235
# generate Group Policy definitions
33-
node build/lib/policies
36+
node build/lib/policies win32
3437

3538
# in CI, packaging will be done by a different job
3639
if [[ "${CI_BUILD}" == "no" ]]; then
3740
. ../build/windows/rtf/make.sh
3841

39-
yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
42+
npm run gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
4043

4144
if [[ "${VSCODE_ARCH}" != "x64" ]]; then
4245
SHOULD_BUILD_REH="no"
@@ -48,7 +51,7 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
4851
else # linux
4952
# in CI, packaging will be done by a different job
5053
if [[ "${CI_BUILD}" == "no" ]]; then
51-
yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
54+
npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
5255

5356
find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c
5457
fi
@@ -57,13 +60,13 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
5760
fi
5861

5962
if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
60-
yarn gulp minify-vscode-reh
61-
yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
63+
npm run gulp minify-vscode-reh
64+
npm run gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
6265
fi
6366

6467
if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
65-
yarn gulp minify-vscode-reh-web
66-
yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
68+
npm run gulp minify-vscode-reh-web
69+
npm run gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
6770
fi
6871

6972
cd ..

‎build/alpine/package_reh.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ fi
5151

5252
if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
5353
echo "Building REH"
54-
yarn gulp minify-vscode-reh
55-
yarn gulp "vscode-reh-${PA_NAME}-min-ci"
54+
npm run gulp minify-vscode-reh
55+
npm run gulp "vscode-reh-${PA_NAME}-min-ci"
5656

5757
pushd "../vscode-reh-${PA_NAME}"
5858

@@ -64,8 +64,8 @@ fi
6464

6565
if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
6666
echo "Building REH-web"
67-
yarn gulp minify-vscode-reh-web
68-
yarn gulp "vscode-reh-web-${PA_NAME}-min-ci"
67+
npm run gulp minify-vscode-reh-web
68+
npm run gulp "vscode-reh-web-${PA_NAME}-min-ci"
6969

7070
pushd "../vscode-reh-web-${PA_NAME}"
7171

‎build/linux/package_bin.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
1818

1919
export VSCODE_PLATFORM='linux'
2020
export VSCODE_SKIP_NODE_VERSION_CHECK=1
21-
export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
21+
export VSCODE_SYSROOT_PREFIX='-glibc-2.28'
2222

2323
if [[ "${VSCODE_ARCH}" == "arm64" || "${VSCODE_ARCH}" == "armhf" ]]; then
2424
export VSCODE_SKIP_SYSROOT=1
2525
export USE_GNUPP2A=1
2626
elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
2727
export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
2828
export VSCODE_SYSROOT_VERSION='20240129-253798'
29-
export VSCODE_SYSROOT_PREFIX='-glibc-2.28'
3029
export USE_GNUPP2A=1
3130
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
3231
export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
@@ -55,7 +54,7 @@ if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sh" ]]; then
5554
# shellcheck disable=SC1090
5655
source "../build/linux/${VSCODE_ARCH}/electron.sh"
5756

58-
TARGET=$( yarn config get target )
57+
TARGET=$( npm config get target )
5958

6059
# Only fails at different major versions
6160
if [[ "${ELECTRON_VERSION%%.*}" != "${TARGET%%.*}" ]]; then
@@ -129,7 +128,7 @@ done
129128

130129
node build/azure-pipelines/distro/mixin-npm
131130

132-
yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
131+
npm run gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
133132

134133
if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
135134
bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"

‎build/linux/package_reh.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
164164

165165
if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
166166
echo "Building REH"
167-
yarn gulp minify-vscode-reh
168-
yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
167+
npm run gulp minify-vscode-reh
168+
npm run gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
169169

170170
EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
171171

@@ -183,8 +183,8 @@ fi
183183

184184
if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
185185
echo "Building REH-web"
186-
yarn gulp minify-vscode-reh-web
187-
yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
186+
npm run gulp minify-vscode-reh-web
187+
npm run gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
188188

189189
EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
190190

‎build/windows/package.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ node build/azure-pipelines/distro/mixin-npm
2424

2525
. ../build/windows/rtf/make.sh
2626

27-
yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
27+
npm run gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
2828

2929
if [[ "${VSCODE_ARCH}" == "x64" ]]; then
3030
if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
3131
echo "Building REH"
32-
yarn gulp minify-vscode-reh
33-
yarn gulp "vscode-reh-win32-${VSCODE_ARCH}-min-ci"
32+
npm run gulp minify-vscode-reh
33+
npm run gulp "vscode-reh-win32-${VSCODE_ARCH}-min-ci"
3434
fi
3535

3636
if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
3737
echo "Building REH-web"
38-
yarn gulp minify-vscode-reh-web
39-
yarn gulp "vscode-reh-web-win32-${VSCODE_ARCH}-min-ci"
38+
npm run gulp minify-vscode-reh-web
39+
npm run gulp "vscode-reh-web-win32-${VSCODE_ARCH}-min-ci"
4040
fi
4141
fi
4242

‎check_tags.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else
2222
LATEST_VERSION=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.tag_name' )
2323
RECHECK_ASSETS="${SHOULD_BUILD}"
2424

25-
if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+) ]]; then
25+
if [[ "${LATEST_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-5]) ]]; then
2626
if [[ "${MS_TAG}" != "${BASH_REMATCH[1]}" ]]; then
2727
echo "New VSCode version, new build"
2828
export SHOULD_BUILD="yes"

0 commit comments

Comments
 (0)