Skip to content

Commit a60f159

Browse files
committed
Revert static linking
1 parent 0c8acb8 commit a60f159

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
version:
1212
- 5.3.3
13-
- 5.4.1
13+
- 5.4.2
1414
- nightly
1515
container:
1616
image: stevapple/swift-scf:${{ matrix.version }}
@@ -22,11 +22,6 @@ jobs:
2222
- name: Test CloudFunctions example
2323
working-directory: Examples/CloudFunctions
2424
run: swift build
25-
- name: Test static linking
26-
working-directory: Examples/CloudFunctions
27-
run: |
28-
yum install libxml2-static zlib-static -y
29-
swift build --product APIGateway -c release -Xswiftc -static-executable
3025
- name: Test LocalDebugging example
3126
working-directory: Examples/LocalDebugging/MyCloudFunction
3227
run: swift build
@@ -43,7 +38,7 @@ jobs:
4338
- centos8
4439
version:
4540
- 5.3.3
46-
- 5.4.1
41+
- 5.4.2
4742
container:
4843
image: swift:${{ matrix.version }}-${{ matrix.os }}
4944
steps:

Examples/CloudFunctions/scripts/build-and-package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ echo "-------------------------------------------------------------------------"
4141
echo "Building \"$executable\" SCF"
4242
echo "-------------------------------------------------------------------------"
4343
docker run --rm -v "$workspace":/workspace -w /workspace/Examples/CloudFunctions builder \
44-
bash -cl "swift build --product $executable -c release -Xswiftc -static-executable"
44+
bash -cl "swift build --product $executable -c release"
4545
echo "done"
4646

4747
echo "-------------------------------------------------------------------------"

Examples/CloudFunctions/scripts/package.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ rm -rf "$target"
3535
mkdir -p "$target"
3636

3737
cp ".build/release/$executable" "$target/bootstrap"
38+
ldd ".build/release/$executable" | grep swift | awk '{print $3}' | xargs cp -Lv -t "$target"
39+
3840
cd "$target"
3941
zip ../$executable.zip *

0 commit comments

Comments
 (0)