From 255d300e25ab5a93c13ac7504b865f7e955b4d1e Mon Sep 17 00:00:00 2001 From: Daniel Leech Date: Sat, 10 May 2025 18:56:24 +0100 Subject: [PATCH 1/3] Try macos --- .github/workflows/release.yml | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5043e5a..2bf65d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,12 +4,58 @@ permissions: contents: write on: + pull_request: push: tags: - "*.*.*" jobs: publish: + name: "Publish for ${{ matrix.os }}" + runs-on: "${{ matrix.os }}" + strategy: + matrix: + include: + - name: linux-x86 + os: ubuntu-latest + artifact_name: target/x86_64-unknown-linux-musl/release/debug-tui + asset_name: debug-tui-linux + target: "x86_64-unknown-linux-musl" + - name: mac-aarch64 + os: macos-14 + target: "aarch64-apple-darwin" + artifact_name: target/x86_64-unknown-linux-musl/release/debug-tui + asset_name: debug-tui-linux + + steps: + - uses: actions/checkout@v3 + - name: Install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + target: ${{ matrix.target }} + + - name: Install MUSL + if: matrix.target == 'x86_64-unknown-linux-musl' + run: sudo apt install musl-tools + + - name: Build + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --target ${{ matrix.target }} + + - name: Rename + run: mv ${{ matrix.artifact_name }} ${{ matrix.asset_name }} + + # - name: Release + # uses: softprops/action-gh-release@v1 + # with: + # files: ${{ matrix.asset_name }} + + publish-mac-windows: name: "Publish for ${{ matrix.os }}" runs-on: "${{ matrix.os }}" strategy: From bee98efcef8c965c12121f42608983315f745fda Mon Sep 17 00:00:00 2001 From: Daniel Leech Date: Sat, 10 May 2025 19:07:17 +0100 Subject: [PATCH 2/3] Up --- .github/workflows/release.yml | 47 +++-------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2bf65d7..4cb4386 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,13 +19,13 @@ jobs: - name: linux-x86 os: ubuntu-latest artifact_name: target/x86_64-unknown-linux-musl/release/debug-tui - asset_name: debug-tui-linux + asset_name: debug-tui-linux_x86_64 target: "x86_64-unknown-linux-musl" - name: mac-aarch64 os: macos-14 target: "aarch64-apple-darwin" - artifact_name: target/x86_64-unknown-linux-musl/release/debug-tui - asset_name: debug-tui-linux + artifact_name: target/aarch64-apple-darwin/release/debug-tui + asset_name: debug-tui-aarch64 steps: - uses: actions/checkout@v3 @@ -47,6 +47,7 @@ jobs: command: build args: --release --target ${{ matrix.target }} + - run: ls target - name: Rename run: mv ${{ matrix.artifact_name }} ${{ matrix.asset_name }} @@ -54,43 +55,3 @@ jobs: # uses: softprops/action-gh-release@v1 # with: # files: ${{ matrix.asset_name }} - - publish-mac-windows: - name: "Publish for ${{ matrix.os }}" - runs-on: "${{ matrix.os }}" - strategy: - matrix: - include: - - name: linux - os: ubuntu-latest - artifact_name: target/x86_64-unknown-linux-musl/release/debug-tui - asset_name: debug-tui-linux - target: "x86_64-unknown-linux-musl" - - steps: - - uses: actions/checkout@v3 - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - target: ${{ matrix.target }} - - - name: Install MUSL - if: matrix.target == 'x86_64-unknown-linux-musl' - run: sudo apt install musl-tools - - - name: Build - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --target ${{ matrix.target }} - - - name: Rename - run: mv ${{ matrix.artifact_name }} ${{ matrix.asset_name }} - - - name: Release - uses: softprops/action-gh-release@v1 - with: - files: ${{ matrix.asset_name }} From 5cb576db513692c4b822dc68ce38121e3c6e7f95 Mon Sep 17 00:00:00 2001 From: Daniel Leech Date: Sat, 10 May 2025 19:12:54 +0100 Subject: [PATCH 3/3] Mac build --- .github/workflows/release.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4cb4386..3658825 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ permissions: contents: write on: - pull_request: push: tags: - "*.*.*" @@ -26,6 +25,11 @@ jobs: target: "aarch64-apple-darwin" artifact_name: target/aarch64-apple-darwin/release/debug-tui asset_name: debug-tui-aarch64 + - name: mac-aarch64 + os: macos-14 + target: "aarch64-apple-darwin" + artifact_name: target/aarch64-apple-darwin/release/debug-tui + asset_name: debug-tui-aarch64 steps: - uses: actions/checkout@v3 @@ -47,11 +51,10 @@ jobs: command: build args: --release --target ${{ matrix.target }} - - run: ls target - name: Rename run: mv ${{ matrix.artifact_name }} ${{ matrix.asset_name }} - # - name: Release - # uses: softprops/action-gh-release@v1 - # with: - # files: ${{ matrix.asset_name }} + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: ${{ matrix.asset_name }}