Skip to content

Commit 4f477fa

Browse files
committed
ci: build full regression prerequisites
1 parent c38c74d commit 4f477fa

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

.github/workflows/build-ssdb.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
type: boolean
1717
default: false
1818
regression_suites:
19-
description: 'space-separated test.py regression suites to run after building'
19+
description: 'space-separated test.py regression selectors to run after building'
2020
type: string
2121
default: ''
2222
outputs:
@@ -75,6 +75,11 @@ jobs:
7575
nix develop .#cpp -c ./configure.py --mode ${{ inputs.build_mode }} "${artifacts[@]}" --no-seastar-unused-result-error
7676
- run: |
7777
nix develop .#cpp -c ninja build/${{ inputs.build_mode }}/scylla
78+
- name: Prepare regression build artifacts
79+
if: ${{ inputs.regression_suites != '' }}
80+
run: |
81+
nix develop .#cpp -c ninja wasm
82+
nix develop .#cpp -c patchelf --set-rpath "$PWD/build/${{ inputs.build_mode }}/seastar" build/${{ inputs.build_mode }}/scylla
7883
- name: Build inherited smoke tests
7984
if: ${{ inputs.run_smoke_tests }}
8085
run: |

configure.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,11 +1976,11 @@ def write_build_file(f,
19761976
rule cxxbridge_header
19771977
command = cxxbridge --header > $out
19781978
rule c2wasm
1979-
command = clang --target=wasm32 --no-standard-libraries -Wl,--export-all -Wl,--no-entry $in -o $out
1979+
command = env NIX_HARDENING_ENABLE= clang --target=wasm32 --no-standard-libraries -Wl,--export-all -Wl,--no-entry $in -o $out
19801980
description = C2WASM $out
19811981
rule rust2wasm
1982-
command = cargo build --target=wasm32-wasi --example=$example --locked --manifest-path=test/resource/wasm/rust/Cargo.toml --target-dir=$builddir/wasm/ $
1983-
&& wasm-opt -Oz $builddir/wasm/wasm32-wasi/debug/examples/$example.wasm -o $builddir/wasm/$example.wasm $
1982+
command = cargo build --target=wasm32-unknown-unknown --example=$example --locked --manifest-path=test/resource/wasm/rust/Cargo.toml --target-dir=$builddir/wasm/ $
1983+
&& wasm-opt -Oz $builddir/wasm/wasm32-unknown-unknown/debug/examples/$example.wasm -o $builddir/wasm/$example.wasm $
19841984
&& wasm-strip $builddir/wasm/$example.wasm
19851985
description = RUST2WASM $out
19861986
rule wasm2wat

default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ in derive ({
8686
antlr3Package
8787
] ++ (with pkgs; [
8888
ant
89+
binaryen
8990
boost
9091
cargo
9192
cmake
@@ -104,6 +105,7 @@ in derive ({
104105
ragel
105106
rustc
106107
stow
108+
wabt
107109
]) ++ (devInputs { inherit pkgs llvm; });
108110

109111
buildInputs = [

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
++ pythonTools
9090
++ (with pkgs; [
9191
antlr3_4
92+
binaryen
9293
file
9394
git
9495
jdk11_headless
@@ -139,6 +140,8 @@
139140
doxygen
140141
rapidxml
141142
colordiff
143+
binaryen
144+
patchelf
142145
wabt
143146
];
144147
}

0 commit comments

Comments
 (0)