Skip to content

Commit 15a6695

Browse files
Revert "temporary: set up early exit again"
This reverts commit 385176b.
1 parent 385176b commit 15a6695

File tree

3 files changed

+22
-26
lines changed

3 files changed

+22
-26
lines changed

.github/workflows/main.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
./utils/webassembly/ci.sh
4848
echo "Cleanup build directory to free disk space"
4949
rm -rf ../build
50-
# - name: Upload Linux installable archive
51-
# uses: actions/upload-artifact@v1
52-
# with:
53-
# name: linux-installable
54-
# path: ../swift-wasm-5.3-SNAPSHOT-linux.tar.gz
50+
- name: Upload Linux installable archive
51+
uses: actions/upload-artifact@v1
52+
with:
53+
name: linux-installable
54+
path: ../swift-wasm-5.3-SNAPSHOT-linux.tar.gz
5555
# - name: Pack test results
5656
# run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
5757
# - name: Upload test results
@@ -84,23 +84,23 @@ jobs:
8484
run: |
8585
sudo xcode-select --switch /Applications/Xcode_12_beta.app/Contents/Developer/
8686
./utils/webassembly/ci.sh
87-
# - name: Upload macOS installable archive
88-
# uses: actions/upload-artifact@v1
89-
# with:
90-
# name: macos-installable
91-
# path: ../swift-wasm-5.3-SNAPSHOT-osx.tar.gz
92-
# - name: Upload packaging scripts
93-
# uses: actions/upload-artifact@v1
94-
# with:
95-
# name: packaging-scripts
96-
# path: utils/webassembly
97-
# - name: Pack test results
98-
# run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
99-
# - name: Upload test results
100-
# uses: actions/upload-artifact@v1
101-
# with:
102-
# name: macos-test-results
103-
# path: ./swift-test-results.tar.gz
87+
- name: Upload macOS installable archive
88+
uses: actions/upload-artifact@v1
89+
with:
90+
name: macos-installable
91+
path: ../swift-wasm-5.3-SNAPSHOT-osx.tar.gz
92+
- name: Upload packaging scripts
93+
uses: actions/upload-artifact@v1
94+
with:
95+
name: packaging-scripts
96+
path: utils/webassembly
97+
- name: Pack test results
98+
run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
99+
- name: Upload test results
100+
uses: actions/upload-artifact@v1
101+
with:
102+
name: macos-test-results
103+
path: ./swift-test-results.tar.gz
104104

105105
macos_smoke_test:
106106
name: Run smoke tests on macOS

utils/webassembly/build-toolchain.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ $SOURCE_PATH/swift/utils/build-script \
5050
TOOLCHAIN_NAME="$TOOLCHAIN_NAME" \
5151
C_CXX_LAUNCHER="$(which sccache)"
5252

53-
exit 0
54-
5553
# Clean up the host toolchain build directory so that the next
5654
# `build-script` invocation doesn't pick up wrong CMake config files.
5755
# For some reason passing `--reconfigure` to `build-script` won't do this.

utils/webassembly/ci.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ FLAGS="--release $CACHE_FLAGS --verbose"
2727

2828
$BUILD_SCRIPT $FLAGS
2929

30-
exit 0
31-
3230
if [[ "$(uname)" == "Darwin" ]]; then
3331
# workaround: host target test directory is necessary to use run-test
3432
mkdir -p $BUILD_DIR/swift-macosx-x86_64/test-macosx-x86_64

0 commit comments

Comments
 (0)