diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-12-10 20:11:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 20:11:34 -0500 |
| commit | 030f4ddd6a9b48050215f5513883fa0d4f167c47 (patch) | |
| tree | 554824e93d4dbbdb505c311e2942b8fd85ec3c9a | |
| parent | aef386913ebe4c786051d8af0957035533838eef (diff) | |
ci: Switch to musl for homebrew linux (#347)
Move from gnu to musl to avoid glibc issues.
| -rw-r--r-- | .github/workflows/deployment.yml | 4 | ||||
| -rw-r--r-- | deployment/macos/homebrew/bottom.rb.template | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 2943766d..237b682a 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -233,7 +233,7 @@ jobs: asset_content_type: application/octet-stream - name: Add download asset to artifact if required - if: matrix.triple.target == 'x86_64-unknown-linux-gnu' || matrix.triple.target == 'x86_64-pc-windows-msvc' || matrix.triple.target == 'i686-pc-windows-msvc' || matrix.triple.target == 'x86_64-apple-darwin' + if: matrix.triple.target == 'x86_64-unknown-linux-musl' || matrix.triple.target == 'x86_64-pc-windows-msvc' || matrix.triple.target == 'i686-pc-windows-msvc' || matrix.triple.target == 'x86_64-apple-darwin' run: cp ${{ env.ASSET }} artifacts/ - name: Upload artifacts @@ -370,7 +370,7 @@ jobs: - name: Execute Homebrew packaging script run: | - python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/macos/homebrew/bottom.rb.template" "./bottom.rb" "SHA256" "./artifacts/bottom_x86_64-apple-darwin.tar.gz" "./artifacts/bottom_x86_64-unknown-linux-gnu.tar.gz"; + python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/macos/homebrew/bottom.rb.template" "./bottom.rb" "SHA256" "./artifacts/bottom_x86_64-apple-darwin.tar.gz" "./artifacts/bottom_x86_64-unknown-linux-musl.tar.gz"; - name: Upload bottom.rb to release uses: actions/upload-release-asset@v1.0.1 diff --git a/deployment/macos/homebrew/bottom.rb.template b/deployment/macos/homebrew/bottom.rb.template index 27ec8b68..0f8a8293 100644 --- a/deployment/macos/homebrew/bottom.rb.template +++ b/deployment/macos/homebrew/bottom.rb.template @@ -6,7 +6,7 @@ class Bottom < Formula url "https://github.com/ClementTsang/bottom/releases/download/#{version}/bottom_x86_64-apple-darwin.tar.gz" sha256 "$hash1" elsif OS.linux? - url "https://github.com/ClementTsang/bottom/releases/download/#{version}/bottom_x86_64-unknown-linux-gnu.tar.gz" + url "https://github.com/ClementTsang/bottom/releases/download/#{version}/bottom_x86_64-unknown-linux-musl.tar.gz" sha256 "$hash2" end |