Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: prepare for 1.92 #1970

Merged
merged 8 commits into from
Aug 12, 2024
Merged

feat: prepare for 1.92 #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
beac8ef
feat: update patches
daiyam Jul 22, 2024
6118ae5
fix: linux patches
daiyam Jul 22, 2024
01144c7
fix: update dependency
daiyam Aug 12, 2024
c3aa947
fix: update before installing libkrb5
daiyam Aug 12, 2024
e43feb8
fix(linux): update dependencies
daiyam Aug 12, 2024
ea3a59c
build(riscv): bump electron to v30.1.2.riscv2 for insider (#2)
kxxt Aug 12, 2024
6cc1a4a
ci: update stable workfow [skip ci]
daiyam Aug 12, 2024
847090c
build(rpm): move to el8 [skip ci]
daiyam Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/insider-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Clone VSCode repo
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Download vscode artifact
Expand Down Expand Up @@ -276,7 +276,7 @@ jobs:
python-version: '3.11'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev

- name: Install GH
run: ./install_gh.sh
Expand Down Expand Up @@ -355,7 +355,7 @@ jobs:
run: ./check_tags.sh

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Download vscode artifact
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/stable-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Clone VSCode repo
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
if: env.SHOULD_BUILD == 'yes'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Download vscode artifact
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
python-version: '3.11'

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev

- name: Install GH
run: ./install_gh.sh
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
run: ./check_tags.sh

- name: Install libkrb5-dev
run: sudo apt-get install -y libkrb5-dev
run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
if: env.SHOULD_BUILD == 'yes'

- name: Download vscode artifact
Expand Down
66 changes: 19 additions & 47 deletions build/update_patches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,69 +12,41 @@ while getopts ":i" opt; do
esac
done

cd vscode || { echo "'vscode' dir not found"; exit 1; }

git add .
git reset -q --hard HEAD
check_file() {
if [[ -f "${1}" ]]; then
echo applying patch: "${1}"
if ! git apply --ignore-whitespace "${1}"; then
echo failed to apply patch "${1}"

for FILE in ../patches/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"

git apply --reject "${FILE}"
git apply --reject "${1}"
git apply --reject "../patches/helper/settings.patch"

read -rp "Press any key when the conflict have been resolved..." -n1 -s

git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
git diff --staged -U1 > "${1}"
fi
git add .
git reset -q --hard HEAD
fi
done
}

if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
for FILE in ../patches/insider/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"
cd vscode || { echo "'vscode' dir not found"; exit 1; }

git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"
git add .
git reset -q --hard HEAD

read -rp "Press any key when the conflict have been resolved..." -n1 -s
for FILE in ../patches/*.patch; do
check_file "${FILE}"
done

git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
git add .
git reset -q --hard HEAD
fi
if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
for FILE in ../patches/insider/*.patch; do
check_file "${FILE}"
done
fi

for FILE in ../patches/linux/*.patch; do
if [[ -f "${FILE}" ]]; then
echo applying patch: "${FILE}"
if ! git apply --ignore-whitespace "${FILE}"; then
echo failed to apply patch "${FILE}"

git apply --reject "${FILE}"
git apply --reject "../patches/helper/settings.patch"

read -rp "Press any key when the conflict have been resolved..." -n1 -s

git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"
fi
git add .
git reset -q --hard HEAD
fi
for FILE in ../patches/linux/*/*.patch; do
check_file "${FILE}"
done
4 changes: 2 additions & 2 deletions insider.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"tag": "1.91.0",
"commit": "5f646b8e67a869ef33061085ffe0e377d5ba040c"
"tag": "1.92.0",
"commit": "97d1b933ada0ca69bea107f7a89e029991277ccc"
}
8 changes: 4 additions & 4 deletions package_linux_bin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
export VSCODE_ELECTRON_REPO='riscv-forks/electron-riscv-releases'
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
ELECTRON_VERSION="29.4.0"
ELECTRON_VERSION="30.1.2"
if [[ "${ELECTRON_VERSION}" != "$(yarn config get target)" ]]; then
# Fail the pipeline if electron target doesn't match what is used.
# Fail the pipeline if electron target doesn't match what is used.
# Look for releases here if electron version used by vscode changed:
# https://github.com/riscv-forks/electron-riscv-releases/releases
echo "Electron RISC-V binary version doesn't match target electron version!"
exit 1
fi
export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv3"
echo "c2b55b6fee59dd2f29138b0052536d5c254c04c29bc322bd3e877bb457799fca *electron-v29.4.0-linux-riscv64.zip" >> build/checksums/electron.txt
export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv2"
echo "871a049ae913a37664532e93e6d1c8dc2da6260e9297c90d6d525f79581948b8 *electron-v30.1.2-linux-riscv64.zip" >> build/checksums/electron.txt
fi

if [[ -d "../patches/linux/client/" ]]; then
Expand Down
Loading