From dfa47638ec1fef7602e282f7b7a940126a5068d9 Mon Sep 17 00:00:00 2001 From: Liam <33645555+lj3954@users.noreply.github.com> Date: Sat, 27 Jul 2024 03:37:31 -0700 Subject: [PATCH] chore: Statically link binaries with musl to improve compatibility --- .github/workflows/linutil.yml | 82 +++++++++++++++--------------- .github/workflows/pre-release.yaml | 8 +-- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml index 30f7f8ad..e801737b 100644 --- a/.github/workflows/linutil.yml +++ b/.github/workflows/linutil.yml @@ -1,40 +1,42 @@ -name: LinUtil Release - -on: - push: - branches: [ "main" ] - -permissions: - contents: write - packages: write - -env: - CARGO_TERM_COLOR: always - -jobs: - linutil_build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Cache Cargo registry - uses: actions/cache@v4 - with: - path: ~/.cargo/registry - key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - restore-keys: ${{ runner.os }}-cargo-registry- - - name: Cache Cargo index - uses: actions/cache@v4 - with: - path: ~/.cargo/git - key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} - restore-keys: ${{ runner.os }}-cargo-index- - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - name: Build - run: cargo build --target-dir=build --release --verbose - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Commit Linutil - file_pattern: 'build/release/linutil' - if: success() +name: LinUtil Release + +on: + push: + branches: ["main"] + +permissions: + contents: write + packages: write + +env: + CARGO_TERM_COLOR: always + +jobs: + linutil_build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Cache Cargo registry + uses: actions/cache@v4 + with: + path: ~/.cargo/registry + key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-cargo-registry- + - name: Cache Cargo index + uses: actions/cache@v4 + with: + path: ~/.cargo/git + key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} + restore-keys: ${{ runner.os }}-cargo-index- + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-unknown-linux-musl + - name: Build + run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl + - uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: Commit Linutil + file_pattern: "build/x86_64-unknown-linux-musl/release/linutil" + if: success() diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml index f8e816c2..5a64da69 100644 --- a/.github/workflows/pre-release.yaml +++ b/.github/workflows/pre-release.yaml @@ -1,8 +1,8 @@ name: Pre-Release LinUtil permissions: - contents: write # Grant write permissions to contents - packages: write # Grant write permissions to packages + contents: write # Grant write permissions to contents + packages: write # Grant write permissions to packages on: workflow_dispatch: # Manual trigger added @@ -30,9 +30,9 @@ jobs: body: "![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/linutil/${{ env.version }}/linutil)" append_body: false files: | - ./build/release/linutil + ./build/x86_64-unknown-linux-musl/release/linutil prerelease: true generate_release_notes: true env: version: ${{ env.version }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}