This is an automated email from the ASF dual-hosted git repository.
style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-swift.git
The following commit(s) were added to refs/heads/master by this push:
new 911312d Remove test binary files and generate them before tests (#126)
911312d is described below
commit 911312df9aadc943a65db6f5cd2e413615d13ad6
Author: jiangpch <[email protected]>
AuthorDate: Wed Feb 17 10:09:27 2021 +0800
Remove test binary files and generate them before tests (#126)
---
tests/dat/actions/HelloSwift4/Package.swift | 3 ++-
tests/dat/actions/HelloSwift4Codable/Package.swift | 3 ++-
tests/dat/build.sh | 17 +++++++++--------
tests/dat/build/swift4.1/HelloSwift4.zip | Bin 12053 -> 0 bytes
tests/dat/build/swift4.1/HelloSwift4Codable.zip | Bin 17237 -> 0 bytes
tests/dat/build/swift4.1/SwiftyRequest.zip | Bin 200346 -> 0 bytes
tests/dat/build/swift4.1/SwiftyRequestCodable.zip | Bin 203924 -> 0 bytes
tests/dat/build/swift4.2/HelloSwift4.zip | Bin 2186350 -> 0 bytes
tests/dat/build/swift4.2/HelloSwift4Codable.zip | Bin 2190710 -> 0 bytes
tests/dat/build/swift4.2/SwiftyRequest.zip | Bin 154371 -> 0 bytes
tests/dat/build/swift4.2/SwiftyRequestCodable.zip | Bin 159216 -> 0 bytes
tests/dat/build/swift5.1/HelloSwift5.zip | Bin 12611 -> 0 bytes
tests/dat/build/swift5.1/HelloSwift5Codable.zip | Bin 20600 -> 0 bytes
tests/dat/build/swift5.1/SwiftyRequest5.zip | Bin 2427796 -> 0 bytes
tests/dat/build/swift5.1/SwiftyRequestCodable5.zip | Bin 2433716 -> 0 bytes
tests/dat/build/swift5.3/HelloSwift5.zip | Bin 23934 -> 0 bytes
tests/dat/build/swift5.3/HelloSwift5Codable.zip | Bin 36717 -> 0 bytes
tests/dat/build/swift5.3/SwiftyRequest5.zip | Bin 6607555 -> 0 bytes
tests/dat/build/swift5.3/SwiftyRequestCodable5.zip | Bin 6617585 -> 0 bytes
tools/build/compile.sh | 3 ++-
tools/travis/build.sh | 4 ++++
21 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/tests/dat/actions/HelloSwift4/Package.swift
b/tests/dat/actions/HelloSwift4/Package.swift
index 949fb7a..22f96a5 100644
--- a/tests/dat/actions/HelloSwift4/Package.swift
+++ b/tests/dat/actions/HelloSwift4/Package.swift
@@ -30,7 +30,8 @@ let package = Package(
],
targets: [
.target(
- name: "Action"
+ name: "Action",
+ path: "."
)
]
)
diff --git a/tests/dat/actions/HelloSwift4Codable/Package.swift
b/tests/dat/actions/HelloSwift4Codable/Package.swift
index 949fb7a..22f96a5 100644
--- a/tests/dat/actions/HelloSwift4Codable/Package.swift
+++ b/tests/dat/actions/HelloSwift4Codable/Package.swift
@@ -30,7 +30,8 @@ let package = Package(
],
targets: [
.target(
- name: "Action"
+ name: "Action",
+ path: "."
)
]
)
diff --git a/tests/dat/build.sh b/tests/dat/build.sh
index 7dd9180..3476292 100755
--- a/tests/dat/build.sh
+++ b/tests/dat/build.sh
@@ -23,16 +23,17 @@ set -e
../../tools/build/compile.sh SwiftyRequestCodable swift:4.1 "-v"
../../tools/build/compile.sh HelloSwift4Codable swift:4.1 "-v"
+../../tools/build/compile5.sh action-swift-v4.2 HelloSwift4 swift4.2 "-v"
+../../tools/build/compile5.sh action-swift-v4.2 HelloSwift4Codable swift4.2
"-v"
+../../tools/build/compile5.sh action-swift-v4.2 SwiftyRequest swift4.2 "-v"
+../../tools/build/compile5.sh action-swift-v4.2 SwiftyRequestCodable swift4.2
"-v"
+
../../tools/build/compile5.sh action-swift-v5.1 HelloSwift5 swift5.1 "-v"
../../tools/build/compile5.sh action-swift-v5.1 HelloSwift5Codable swift5.1
"-v"
-../../tools/build/compile5.sh action-swift-v5.1 SwiftyRequest5 swift:5.1 "-v"
-../../tools/build/compile5.sh action-swift-v5.1 SwiftyRequestCodable5
swift:5.1 "-v"
+../../tools/build/compile5.sh action-swift-v5.1 SwiftyRequest5 swift5.1 "-v"
+../../tools/build/compile5.sh action-swift-v5.1 SwiftyRequestCodable5
swift5.1 "-v"
../../tools/build/compile5.sh action-swift-v5.3 HelloSwift5 swift5.3 "-v"
../../tools/build/compile5.sh action-swift-v5.3 HelloSwift5Codable swift5.3
"-v"
-../../tools/build/compile5.sh action-swift-v5.3 SwiftyRequest5 swift:5.3 "-v"
-../../tools/build/compile5.sh action-swift-v5.3 SwiftyRequestCodable5
swift:5.3 "-v"
-
-
-cd actions
-make all
+../../tools/build/compile5.sh action-swift-v5.3 SwiftyRequest5 swift5.3 "-v"
+../../tools/build/compile5.sh action-swift-v5.3 SwiftyRequestCodable5
swift5.3 "-v"
diff --git a/tests/dat/build/swift4.1/HelloSwift4.zip
b/tests/dat/build/swift4.1/HelloSwift4.zip
deleted file mode 100644
index ab486a9..0000000
Binary files a/tests/dat/build/swift4.1/HelloSwift4.zip and /dev/null differ
diff --git a/tests/dat/build/swift4.1/HelloSwift4Codable.zip
b/tests/dat/build/swift4.1/HelloSwift4Codable.zip
deleted file mode 100644
index 3c5ce7b..0000000
Binary files a/tests/dat/build/swift4.1/HelloSwift4Codable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift4.1/SwiftyRequest.zip
b/tests/dat/build/swift4.1/SwiftyRequest.zip
deleted file mode 100644
index faec590..0000000
Binary files a/tests/dat/build/swift4.1/SwiftyRequest.zip and /dev/null differ
diff --git a/tests/dat/build/swift4.1/SwiftyRequestCodable.zip
b/tests/dat/build/swift4.1/SwiftyRequestCodable.zip
deleted file mode 100644
index ee36592..0000000
Binary files a/tests/dat/build/swift4.1/SwiftyRequestCodable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift4.2/HelloSwift4.zip
b/tests/dat/build/swift4.2/HelloSwift4.zip
deleted file mode 100644
index 9d4b85d..0000000
Binary files a/tests/dat/build/swift4.2/HelloSwift4.zip and /dev/null differ
diff --git a/tests/dat/build/swift4.2/HelloSwift4Codable.zip
b/tests/dat/build/swift4.2/HelloSwift4Codable.zip
deleted file mode 100644
index 2a26962..0000000
Binary files a/tests/dat/build/swift4.2/HelloSwift4Codable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift4.2/SwiftyRequest.zip
b/tests/dat/build/swift4.2/SwiftyRequest.zip
deleted file mode 100644
index c57adc3..0000000
Binary files a/tests/dat/build/swift4.2/SwiftyRequest.zip and /dev/null differ
diff --git a/tests/dat/build/swift4.2/SwiftyRequestCodable.zip
b/tests/dat/build/swift4.2/SwiftyRequestCodable.zip
deleted file mode 100644
index ca0568b..0000000
Binary files a/tests/dat/build/swift4.2/SwiftyRequestCodable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift5.1/HelloSwift5.zip
b/tests/dat/build/swift5.1/HelloSwift5.zip
deleted file mode 100644
index 931ea9e..0000000
Binary files a/tests/dat/build/swift5.1/HelloSwift5.zip and /dev/null differ
diff --git a/tests/dat/build/swift5.1/HelloSwift5Codable.zip
b/tests/dat/build/swift5.1/HelloSwift5Codable.zip
deleted file mode 100644
index b953a72..0000000
Binary files a/tests/dat/build/swift5.1/HelloSwift5Codable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift5.1/SwiftyRequest5.zip
b/tests/dat/build/swift5.1/SwiftyRequest5.zip
deleted file mode 100644
index e286745..0000000
Binary files a/tests/dat/build/swift5.1/SwiftyRequest5.zip and /dev/null differ
diff --git a/tests/dat/build/swift5.1/SwiftyRequestCodable5.zip
b/tests/dat/build/swift5.1/SwiftyRequestCodable5.zip
deleted file mode 100644
index 529f208..0000000
Binary files a/tests/dat/build/swift5.1/SwiftyRequestCodable5.zip and /dev/null
differ
diff --git a/tests/dat/build/swift5.3/HelloSwift5.zip
b/tests/dat/build/swift5.3/HelloSwift5.zip
deleted file mode 100644
index a16e1be..0000000
Binary files a/tests/dat/build/swift5.3/HelloSwift5.zip and /dev/null differ
diff --git a/tests/dat/build/swift5.3/HelloSwift5Codable.zip
b/tests/dat/build/swift5.3/HelloSwift5Codable.zip
deleted file mode 100644
index 2e462ec..0000000
Binary files a/tests/dat/build/swift5.3/HelloSwift5Codable.zip and /dev/null
differ
diff --git a/tests/dat/build/swift5.3/SwiftyRequest5.zip
b/tests/dat/build/swift5.3/SwiftyRequest5.zip
deleted file mode 100644
index cc05056..0000000
Binary files a/tests/dat/build/swift5.3/SwiftyRequest5.zip and /dev/null differ
diff --git a/tests/dat/build/swift5.3/SwiftyRequestCodable5.zip
b/tests/dat/build/swift5.3/SwiftyRequestCodable5.zip
deleted file mode 100644
index e3c01a9..0000000
Binary files a/tests/dat/build/swift5.3/SwiftyRequestCodable5.zip and /dev/null
differ
diff --git a/tools/build/compile.sh b/tools/build/compile.sh
index f3ad0b7..91e562f 100755
--- a/tools/build/compile.sh
+++ b/tools/build/compile.sh
@@ -32,6 +32,7 @@ if [ ${2} == "swift:4.1" ]; then
BASE_PATH="/swift4Action"
DEST_SOURCE="/$BASE_PATH/spm-build/Sources/Action"
OUTPUT_DIR="build/swift4.1"
+ mkdir -p $OUTPUT_DIR || true # create dir when not exist
# Due to a current bug in the Swift Docker image compile optimization is
disabled by default.
# If you need compiler optimization you can override the BUILD_FLAGS to
enable it
BUILD_FLAGS="-Xswiftc -Onone"
@@ -47,7 +48,7 @@ fi
echo "Using runtime $RUNTIME to compile swift"
-docker run --rm --name=compile-ow-swift -it -v "$(pwd):/owexec" $RUNTIME -ex
-c "
+docker run --rm --name=compile-ow-swift -it -v "$(pwd):/owexec" $RUNTIME sh
-ex -c "
if [ -f \"/owexec/$OUTPUT_DIR/$1.zip\" ] ; then
rm \"/owexec/$OUTPUT_DIR/$1.zip\"
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 6b9fbbc..7115c6d 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -59,3 +59,7 @@ TERM=dumb ./gradlew \
:core:swift51Action:distDocker \
:core:swift53Action:distDocker \
-PdockerImagePrefix=${IMAGE_PREFIX}
+
+# Compile test files
+cd $ROOTDIR/tests/dat
+sh build.sh
