Skip to content

Commit 06e98a6

Browse files
authored
fix: glibc version (#1659)
go back to 22.04 to fix glibc version. updates clang for newer features used in v8. also requires a rust toolchain upgrade to build correctly for mysterious and unknown reasons.
1 parent 428b176 commit 06e98a6

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ jobs:
5252
variant: release
5353
cargo: cargo
5454

55-
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-24.04-xl' || 'ubuntu-24.04' }}
55+
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-22.04-xl' || 'ubuntu-22.04' }}
5656
target: x86_64-unknown-linux-gnu
5757
variant: debug
5858
cargo: cargo
5959

60-
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-24.04-xl' || 'ubuntu-24.04' }}
60+
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-22.04-xl' || 'ubuntu-22.04' }}
6161
target: x86_64-unknown-linux-gnu
6262
variant: release
6363
cargo: cargo
@@ -67,12 +67,12 @@ jobs:
6767
variant: release # Note: we do not support windows debug builds.
6868
cargo: cargo
6969

70-
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-24.04-xl' || 'ubuntu-24.04' }}
70+
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-22.04-xl' || 'ubuntu-22.04' }}
7171
target: aarch64-unknown-linux-gnu
7272
variant: debug
7373
cargo: cargo
7474

75-
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-24.04-xl' || 'ubuntu-24.04' }}
75+
- os: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-22.04-xl' || 'ubuntu-22.04' }}
7676
target: aarch64-unknown-linux-gnu
7777
variant: release
7878
cargo: cargo
@@ -103,11 +103,6 @@ jobs:
103103
python-version: 3.11.x
104104
architecture: x64
105105

106-
- name: Install ubuntu deps
107-
if: startsWith(matrix.config.os, 'ubuntu')
108-
run: |
109-
sudo apt-get install -y glib2.0
110-
111106
- name: Install cross compilation toolchain
112107
if: matrix.config.target == 'aarch64-unknown-linux-gnu'
113108
run: |
@@ -116,7 +111,7 @@ jobs:
116111
sudo apt update
117112
sudo apt install -yq --no-install-suggests --no-install-recommends \
118113
binfmt-support g++-10-aarch64-linux-gnu g++-10-multilib \
119-
gcc-10-aarch64-linux-gnu libc6-arm64-cross qemu-system qemu-user \
114+
gcc-10-aarch64-linux-gnu libc6-arm64-cross qemu qemu-user \
120115
qemu-user-binfmt
121116
122117
sudo ln -s /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 \
@@ -169,6 +164,15 @@ jobs:
169164
. $basename/sccache --start-server
170165
echo "$(pwd)/$basename" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
171166
167+
- name: Install Clang
168+
if: startsWith(matrix.config.os, 'ubuntu')
169+
run: |
170+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" | sudo dd of=/etc/apt/sources.list.d/llvm-toolchain-jammy-19.list
171+
curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/llvm-snapshot.gpg
172+
sudo apt-get update
173+
sudo apt-get -qq remove 'clang-*'
174+
sudo apt-get install lld-19 clang-19 clang-tools-19 clang-tidy-19 clang-format-19 -y
175+
172176
- name: Install Rust (nightly)
173177
uses: dtolnay/rust-toolchain@nightly
174178
if: matrix.config.variant == 'asan'
@@ -179,8 +183,7 @@ jobs:
179183
- name: check c++ code formatting
180184
if: startsWith(matrix.config.os, 'ubuntu')
181185
run: |
182-
sudo apt-get install -y clang-format
183-
clang-format --verbose --Werror --dry-run src/*.cc src/*.hpp src/*.h
186+
clang-format-19 --verbose --Werror --dry-run src/*.cc src/*.hpp src/*.h
184187
185188
- name: Test (ASAN)
186189
env:
@@ -237,7 +240,7 @@ jobs:
237240

238241
publish:
239242
needs: build
240-
runs-on: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-24.04-xl' || 'ubuntu-24.04' }}
243+
runs-on: ${{ github.repository == 'denoland/rusty_v8' && 'ubuntu-22.04-xl' || 'ubuntu-22.04' }}
241244
if: github.repository == 'denoland/rusty_v8' && startsWith(github.ref, 'refs/tags/')
242245
steps:
243246
- name: Configure git

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.82.0"
33
components = ["rustfmt", "clippy"]
44
targets = [
55
"x86_64-apple-darwin",

tests/test_api.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11029,8 +11029,7 @@ fn test_fast_calls_callback_options_data() {
1102911029
let scope = &mut v8::ContextScope::new(scope, context);
1103011030

1103111031
let global = context.global(scope);
11032-
let external =
11033-
v8::External::new(scope, unsafe { addr_of_mut!(DATA) as *mut c_void });
11032+
let external = v8::External::new(scope, addr_of_mut!(DATA) as *mut c_void);
1103411033

1103511034
let template = v8::FunctionTemplate::builder(slow_fn)
1103611035
.data(external.into())

0 commit comments

Comments
 (0)