Skip to content

State CPU arch in names of 5.3 distribution tarballs #1919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2020
Merged

State CPU arch in names of 5.3 distribution tarballs #1919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96143f9
State CPU arch in names of distribution tarballs
MaxDesiatov Oct 4, 2020
126f38f
State CPU architecture in the distribution script
MaxDesiatov Oct 4, 2020
208e957
Fix repeated architecture in distribute-latest-toolchain.sh
MaxDesiatov Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions utils/webassembly/build-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions utils/webassembly/distribute-latest-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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-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-osx.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.tar.gz"

popd