Skip to content

Commit 361671b

Browse files
Merge pull request #609 from swiftwasm/update-base-tag/main-swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a
Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a
2 parents f14ff4c + bd3f66e commit 361671b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

schemes/main/build/build-target-toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build_target_toolchain() {
4040
env DESTDIR="$TRIPLE_DESTDIR" \
4141
cmake --install "$TARGET_BUILD_ROOT/$STDLIB_PRODUCT-$HOST_SUFFIX" --prefix /usr
4242

43-
local swift_testing_build_dir="$TARGET_BUILD_ROOT/swift-testing-$SHORT_TRIPLE"
43+
local swift_testing_build_dir="$TARGET_BUILD_ROOT/wasmswiftsdk-$HOST_SUFFIX/swift-testing/$TRIPLE"
4444
# TODO: Remove this check once we build swift-testing for +threads target
4545
if [[ -d "$swift_testing_build_dir" ]]; then
4646
env DESTDIR="$TRIPLE_DESTDIR" \

schemes/main/build/run-test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
set -euxo pipefail
44

55
SOURCE_PATH="$(cd "$(dirname "$0")/../../../.." && pwd)"
6-
TARGET_BUILD_ROOT="$SOURCE_PATH/build/WebAssembly"
6+
BUILD_DIR="$SOURCE_PATH/build"
7+
TARGET_BUILD_ROOT="$BUILD_DIR/WebAssembly"
78

89
HOST_SUFFIX=$(find "$TARGET_BUILD_ROOT" -name "wasmstdlib-*" -exec basename {} \; | sed 's/wasmstdlib-//')
9-
env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX"
10+
env "PATH=$TARGET_BUILD_ROOT/llvm-$HOST_SUFFIX/bin:$BUILD_DIR/llvm-tools/bin:$PATH" "LIT_FILTER_OUT=(IRGen/|embedded/)" ninja check-swift-wasi-wasm32-custom -C "$TARGET_BUILD_ROOT/wasmstdlib-$HOST_SUFFIX"

schemes/main/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-06-12-a",
2+
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a",
33
"icu4c": [],
44
"libxml2": [
55
"https://github.com/swiftwasm/libxml2-wasm/releases/download/2.0.0/libxml2-wasm32-unknown-wasi.tar.gz",

0 commit comments

Comments
 (0)