From 475bc14cb980ac12e88f623a2f619a64e1c91e17 Mon Sep 17 00:00:00 2001 From: kabiroberai Date: Sat, 17 Apr 2021 01:02:42 +0530 Subject: [PATCH] ugh more debugging --- .github/workflows/release.yml | 7 +++---- create-toolchain | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 757521c..b6cb22d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: os: [ubuntu20.04, ubuntu18.04, ubuntu16.04] - runs-on: ubuntu-20.04 + runs-on: macos-latest steps: - uses: actions/checkout@v2 - name: Fetch Upload URL @@ -41,12 +41,11 @@ jobs: - name: Build Release id: build_release run: | - sudo apt-get install cpio xar echo "::set-output name=upload_url::$(cat upload_url.txt)" rm upload_url.txt ./create-toolchain ${{ matrix.os }} - echo "::set-output name=asset_path::"packages/*.tar.xz - echo "::set-output name=asset_name::"$(basename packages/*.tar.xz) + echo "::set-output name=asset_path::"packages/* + echo "::set-output name=asset_name::"$(basename packages/*) - name: Upload Release uses: actions/upload-release-asset@v1 env: diff --git a/create-toolchain b/create-toolchain index f4e8f88..ff3ce5a 100755 --- a/create-toolchain +++ b/create-toolchain @@ -110,5 +110,5 @@ curl -#L "https://github.com/kabiroberai/darwin-tools-linux/releases/download/v2 info "Packaging toolchain" mkdir -p ../packages # this takes forever but xz is around half the size of gz so imo worth it -tar -c linux | xz -zvc -T 0 > "../packages/swift-${swift_version}-${linux_version}.tar.xz" +tar -c linux | xz -z -vv -c -T 0 > "../packages/swift-${swift_version}-${linux_version}.tar.xz" rm -rf linux mac