ci: Switch to musl for homebrew linux (#347)

Move from gnu to musl to avoid glibc issues.
This commit is contained in:
Clement Tsang 2020-12-10 20:11:34 -05:00 committed by GitHub
parent aef386913e
commit 030f4ddd6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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