From 11ef58bffbb28e8908fc2f8b87a1d428909cf655 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 16 Nov 2019 11:21:09 +0000 Subject: [PATCH 1/5] Add more logging to the smoke test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ece20e7139ad..f66374a65bb30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: ./build-packages.sh cd output - tar xf swiftwasm-sdk-linux.tar.xz + tar xf swiftwasm-sdk-linux.tar.xz && echo "Successfully unpacked Linux SDK" cd swiftwasm-sdk - ./swiftwasm example/hello.swift hello.wasm + ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm" \ No newline at end of file From 71892e25355b0cc9bcf0fb063b785c2abef5be20 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 16 Nov 2019 11:22:11 +0000 Subject: [PATCH 2/5] Add a newline to main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f66374a65bb30..16ac7d798aee2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,4 +67,4 @@ jobs: tar xf swiftwasm-sdk-linux.tar.xz && echo "Successfully unpacked Linux SDK" cd swiftwasm-sdk - ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm" \ No newline at end of file + ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm" From c4a288b1127ec2cfae8162139d39ed93d4619003 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 16 Nov 2019 13:46:45 +0000 Subject: [PATCH 3/5] Upload packages and hello.wasm as CI artifacts --- .github/workflows/main.yml | 22 ++++++++++++++++++++-- build-mac.sh | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 16ac7d798aee2..64787fc474de5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: macos-installable - path: ../swiftwasm-mac.tar.gz + path: ../swiftwasm-macos.tar.gz package: name: Build SwiftWasm packages @@ -60,7 +60,7 @@ jobs: ./download-prebuilts.sh cp ../linux-installable/swiftwasm-linux.tar.gz prebuilt/swiftwasm.tar.gz - cp ../macos-installable/swiftwasm-mac.tar.gz prebuilt/swiftwasm-mac.tar.gz + cp ../macos-installable/swiftwasm-macos.tar.gz prebuilt/swiftwasm-mac.tar.gz ./build-packages.sh cd output @@ -68,3 +68,21 @@ jobs: cd swiftwasm-sdk ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm" + + - name: Upload macOS package + uses: actions/upload-artifact@v1 + with: + name: macos-package + path: swiftwasm-package-sdk/output/swiftwasm-sdk-macos.tar.xz + + - name: Upload Linux package + uses: actions/upload-artifact@v1 + with: + name: linux-package + path: swiftwasm-package-sdk/output/swiftwasm-sdk-linux.tar.xz + + - name: Upload hello.wasm compiled with Linux package + uses: actions/upload-artifact@v1 + with: + name: linux-hello.wasm + path: swiftwasm-package-sdk/output/swiftwasm-sdk/hello.wasm diff --git a/build-mac.sh b/build-mac.sh index 2751f98df442c..aee098f9703cc 100755 --- a/build-mac.sh +++ b/build-mac.sh @@ -28,4 +28,4 @@ export sourcedir=$PWD/.. --install-swift \ --install-prefix="/opt/swiftwasm-sdk" \ --install-destdir="$sourcedir/install" \ - --installable-package="$sourcedir/swiftwasm-mac.tar.gz" + --installable-package="$sourcedir/swiftwasm-macos.tar.gz" From 87fac44bd3e3ef0e3e261262be0d4bc06825cce8 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 16 Nov 2019 22:17:17 +0000 Subject: [PATCH 4/5] Normalize filenames for swiftwasm-package-sdk --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64787fc474de5..547b692443999 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,8 +59,9 @@ jobs: cd swiftwasm-package-sdk ./download-prebuilts.sh - cp ../linux-installable/swiftwasm-linux.tar.gz prebuilt/swiftwasm.tar.gz - cp ../macos-installable/swiftwasm-macos.tar.gz prebuilt/swiftwasm-mac.tar.gz + cp ../linux-installable/swiftwasm-linux.tar.gz \ + ../macos-installable/swiftwasm-macos.tar.gz \ + prebuilt ./build-packages.sh cd output From 5b6eeb1f0c19cd0f7481789bfde969b724fbf521 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 16 Nov 2019 22:23:14 +0000 Subject: [PATCH 5/5] Add macos_smoke_test job --- .github/workflows/main.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 547b692443999..8c81e1643c433 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,3 +87,28 @@ jobs: with: name: linux-hello.wasm path: swiftwasm-package-sdk/output/swiftwasm-sdk/hello.wasm + + macos_smoke_test: + name: Compile hello.swift on macOS + runs-on: macOS-10.14 + needs: package + steps: + - name: Download SwiftWasm macOS package + uses: actions/download-artifact@v1 + with: + name: macos-package + + - name: Build hello.wasm + shell: bash + run: | + cd macos-package + tar xf swiftwasm-sdk-macos.tar.xz && echo "Successfully unpacked macOS SDK" + + cd swiftwasm-sdk + ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm" + + - name: Upload hello.wasm compiled with macOS package + uses: actions/upload-artifact@v1 + with: + name: macos-hello.wasm + path: macos-package/swiftwasm-sdk/hello.wasm