From 96143f96d222bad9ce75957320b5bd9660049f68 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sun, 4 Oct 2020 21:42:16 +0100 Subject: [PATCH 1/3] State CPU arch in names of distribution tarballs # Conflicts: # .github/workflows/main.yml # utils/webassembly/build-toolchain.sh --- .github/workflows/main.yml | 11 +++-------- utils/webassembly/build-toolchain.sh | 6 +++--- utils/webassembly/distribute-latest-toolchain.sh | 8 ++++---- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 285f2af6d5626..8c3afd805fe23 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: ubuntu18.04-installable - path: ../swift-wasm-5.3-SNAPSHOT-ubuntu18.04.tar.gz + path: ../swift-wasm-5.3-SNAPSHOT-ubuntu18.04-x86_64.tar.gz # - name: Pack test results # run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results # - name: Upload test results @@ -97,7 +97,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: ubuntu20.04-installable - path: ../swift-wasm-5.3-SNAPSHOT-ubuntu20.04.tar.gz + path: ../swift-wasm-5.3-SNAPSHOT-ubuntu20.04-x86_64.tar.gz # - name: Pack test results # run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results # - name: Upload test results @@ -134,12 +134,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: macos-installable - path: ../swift-wasm-5.3-SNAPSHOT-osx.tar.gz - - name: Upload packaging scripts - uses: actions/upload-artifact@v1 - with: - name: packaging-scripts - path: utils/webassembly + path: ../swift-wasm-5.3-SNAPSHOT-macos-x86_64.tar.gz - name: Pack test results run: tar cJf swift-test-results.tar.gz ../target-build/*/swift-macosx-x86_64/swift-test-results - name: Upload test results diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh index b65de970d8256..e7bbe1a404687 100755 --- a/utils/webassembly/build-toolchain.sh +++ b/utils/webassembly/build-toolchain.sh @@ -8,16 +8,16 @@ WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk case $(uname -s) in Darwin) - OS_SUFFIX=osx + OS_SUFFIX=macos-x86_64 HOST_PRESET=webassembly-host TARGET_PRESET=webassembly-macos-target HOST_SUFFIX=macosx-x86_64 ;; Linux) if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then - OS_SUFFIX=ubuntu18.04 + OS_SUFFIX=ubuntu18.04-x86_64 elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then - OS_SUFFIX=ubuntu20.04 + OS_SUFFIX=ubuntu20.04-x86_64 else echo "Unknown Ubuntu version" exit 1 diff --git a/utils/webassembly/distribute-latest-toolchain.sh b/utils/webassembly/distribute-latest-toolchain.sh index 92a08022da105..e4c55a4d4a5d2 100755 --- a/utils/webassembly/distribute-latest-toolchain.sh +++ b/utils/webassembly/distribute-latest-toolchain.sh @@ -111,15 +111,15 @@ if is_released $toolchain_name; then exit 0 fi -mv swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz "$toolchain_name-ubuntu18.04.tar.gz" -mv swift-wasm-$2-SNAPSHOT-ubuntu20.04.tar.gz "$toolchain_name-ubuntu20.04.tar.gz" -mv swift-wasm-$2-SNAPSHOT-osx.tar.gz "$toolchain_name-osx.tar.gz" +mv swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz "$toolchain_name-ubuntu18.04-x86_64.tar.gz" +mv swift-wasm-$2-SNAPSHOT-ubuntu20.04.tar.gz "$toolchain_name-ubuntu20.04-x86_64.tar.gz" +mv swift-wasm-$2-SNAPSHOT-osx.tar.gz "$toolchain_name-macos-x86_64.tar.gz" create_tag $toolchain_name $head_sha release_id=$(create_release $toolchain_name $toolchain_name $head_sha) upload_tarball $release_id "$toolchain_name-ubuntu18.04.tar.gz" upload_tarball $release_id "$toolchain_name-ubuntu20.04.tar.gz" -upload_tarball $release_id "$toolchain_name-osx.tar.gz" +upload_tarball $release_id "$toolchain_name-macos-x86_64.tar.gz" popd From 126f38f4fd3178174014f7d9e7a9764c8d7d8633 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sun, 4 Oct 2020 21:47:20 +0100 Subject: [PATCH 2/3] State CPU architecture in the distribution script --- utils/webassembly/distribute-latest-toolchain.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/webassembly/distribute-latest-toolchain.sh b/utils/webassembly/distribute-latest-toolchain.sh index e4c55a4d4a5d2..a9326a5e3e53a 100755 --- a/utils/webassembly/distribute-latest-toolchain.sh +++ b/utils/webassembly/distribute-latest-toolchain.sh @@ -104,22 +104,22 @@ unzip ubuntu18.04-installable.zip unzip ubuntu20.04-installable.zip unzip macos-installable.zip -toolchain_name=$(basename $(tar tfz swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz | head -n1)) +toolchain_name=$(basename $(tar tfz swift-wasm-$2-SNAPSHOT-ubuntu18.04-x86_64.tar.gz | head -n1)) if is_released $toolchain_name; then echo "Latest toolchain $toolchain_name has been already released" exit 0 fi -mv swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz "$toolchain_name-ubuntu18.04-x86_64.tar.gz" -mv swift-wasm-$2-SNAPSHOT-ubuntu20.04.tar.gz "$toolchain_name-ubuntu20.04-x86_64.tar.gz" -mv swift-wasm-$2-SNAPSHOT-osx.tar.gz "$toolchain_name-macos-x86_64.tar.gz" +mv swift-wasm-$2-SNAPSHOT-ubuntu18.04-x86_64.tar.gz "$toolchain_name-ubuntu18.04-x86_64.tar.gz" +mv swift-wasm-$2-SNAPSHOT-ubuntu20.04-x86_64.tar.gz "$toolchain_name-ubuntu20.04-x86_64.tar.gz" +mv swift-wasm-$2-SNAPSHOT-macos-x86_64.tar.gz "$toolchain_name-macos-x86_64.tar.gz" create_tag $toolchain_name $head_sha release_id=$(create_release $toolchain_name $toolchain_name $head_sha) -upload_tarball $release_id "$toolchain_name-ubuntu18.04.tar.gz" -upload_tarball $release_id "$toolchain_name-ubuntu20.04.tar.gz" -upload_tarball $release_id "$toolchain_name-macos-x86_64.tar.gz" +upload_tarball $release_id "$toolchain_name-ubuntu18.04-x86_64.tar.gz" +upload_tarball $release_id "$toolchain_name-ubuntu20.04-x86_64.tar.gz" +upload_tarball $release_id "$toolchain_name-macos-x86_64-x86_64.tar.gz" popd From 208e9570d8ae0d335fb7a2ef63799c0716f5ee53 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Mon, 5 Oct 2020 15:32:40 +0100 Subject: [PATCH 3/3] Fix repeated architecture in distribute-latest-toolchain.sh Co-authored-by: Yuta Saito --- utils/webassembly/distribute-latest-toolchain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/webassembly/distribute-latest-toolchain.sh b/utils/webassembly/distribute-latest-toolchain.sh index a9326a5e3e53a..64acb5d3d3d27 100755 --- a/utils/webassembly/distribute-latest-toolchain.sh +++ b/utils/webassembly/distribute-latest-toolchain.sh @@ -120,6 +120,6 @@ release_id=$(create_release $toolchain_name $toolchain_name $head_sha) upload_tarball $release_id "$toolchain_name-ubuntu18.04-x86_64.tar.gz" upload_tarball $release_id "$toolchain_name-ubuntu20.04-x86_64.tar.gz" -upload_tarball $release_id "$toolchain_name-macos-x86_64-x86_64.tar.gz" +upload_tarball $release_id "$toolchain_name-macos-x86_64.tar.gz" popd