Skip to content

Commit 5790c80

Browse files
Merge pull request #56 from lightpanda-io/ci-build
Ci build
2 parents 957f52b + 30cf629 commit 5790c80

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.github/workflows/build-release.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ jobs:
3939
sudo apt-get update
4040
sudo apt-get install -yq libglib2.0-dev
4141
42-
- run: zig build get-tools
4342
- run: zig build get-v8
4443
- run: zig build -Doptimize=ReleaseSafe
45-
- run: mv v8-build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
44+
- run: mv v8/build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
4645

4746
- name: Upload the build
4847
uses: ncipollo/release-action@v1
@@ -75,10 +74,9 @@ jobs:
7574
run: |
7675
echo "version=`cat V8_REVISION`" >> "$GITHUB_OUTPUT"
7776
78-
- run: zig build get-tools
7977
- run: zig build get-v8
8078
- run: zig build -Doptimize=ReleaseSafe
81-
- run: mv v8-build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
79+
- run: mv v8/build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
8280

8381
- name: Upload the build
8482
uses: ncipollo/release-action@v1
@@ -111,10 +109,9 @@ jobs:
111109
sudo apt-get update
112110
sudo apt-get install -yq libglib2.0-dev
113111
114-
- run: zig build get-tools
115112
- run: zig build get-v8
116113
- run: zig build -Doptimize=ReleaseSafe
117-
- run: mv v8-build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
114+
- run: mv v8/build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
118115

119116
- name: Upload the build
120117
uses: ncipollo/release-action@v1
@@ -147,10 +144,9 @@ jobs:
147144
run: |
148145
echo "version=`cat V8_REVISION`" >> "$GITHUB_OUTPUT"
149146
150-
- run: zig build get-tools
151147
- run: zig build get-v8
152148
- run: zig build -Doptimize=ReleaseSafe
153-
- run: mv v8-build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
149+
- run: mv v8/build/${{ env.ARCH }}-${{ env.OS }}/release/ninja/obj/zig/libc_v8.a libc_v8_${{steps.read-version.outputs.version}}_${{ env.OS }}_${{ env.ARCH }}.a
154150

155151
- name: Upload the build
156152
uses: ncipollo/release-action@v1

build.zig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ fn createV8_Build(b: *std.Build, target: std.Build.ResolvedTarget, mode: std.bui
231231
try host_zig_cxx.append("-Wno-error=builtin-assume-aligned-alignment");
232232

233233
try gn_args.append("use_zig_tc=true");
234-
try gn_args.append("cxx_use_ld=\"zig ld.lld\"");
235234

236235
// Build zig cc strings.
237236
var arg = b.fmt("zig_cc=\"{s}\"", .{try std.mem.join(b.allocator, " ", zig_cc.items)});
@@ -243,9 +242,6 @@ fn createV8_Build(b: *std.Build, target: std.Build.ResolvedTarget, mode: std.bui
243242
arg = b.fmt("host_zig_cxx=\"{s}\"", .{try std.mem.join(b.allocator, " ", host_zig_cxx.items)});
244243
try gn_args.append(arg);
245244
} else {
246-
if (builtin.os.tag != .windows) {
247-
try gn_args.append("cxx_use_ld=\"lld\"");
248-
}
249245
if (target.result.os.tag == .linux and target.result.cpu.arch == .aarch64) {
250246
// On linux aarch64, we can not use the clang version provided in v8 sources
251247
// as it's built for x86_64 (TODO: using Rosetta2 for Linux VM on Apple Silicon?)

0 commit comments

Comments
 (0)