From 02b5b5f3c7d06f0677ee77b5102a7cc247217e1b Mon Sep 17 00:00:00 2001 From: "sijie.sun" Date: Sat, 3 Aug 2024 12:41:59 +0800 Subject: [PATCH] use better artifect name --- .github/workflows/core.yml | 31 +++++++++++++++++++++---------- .github/workflows/gui.yml | 10 ++++++++-- .github/workflows/mobile.yml | 5 +++-- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 9f8e17c..b442fb8 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -36,29 +36,40 @@ jobs: include: - TARGET: aarch64-unknown-linux-musl OS: ubuntu-latest + ARTIFACT_NAME: linux-aarch64 - TARGET: x86_64-unknown-linux-musl OS: ubuntu-latest + ARTIFACT_NAME: linux-x86_64 - TARGET: mips-unknown-linux-musl OS: ubuntu-latest + ARTIFACT_NAME: linux-mips - TARGET: mipsel-unknown-linux-musl OS: ubuntu-latest + ARTIFACT_NAME: linux-mipsel + - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested + OS: ubuntu-latest + ARTIFACT_NAME: linux-armv7hf + - TARGET: armv7-unknown-linux-musleabi # raspberry pi 2-3-4, not tested + OS: ubuntu-latest + ARTIFACT_NAME: linux-armv7 + - TARGET: arm-unknown-linux-musleabihf # raspberry pi 0-1, not tested + OS: ubuntu-latest + ARTIFACT_NAME: linux-armhf + - TARGET: arm-unknown-linux-musleabi # raspberry pi 0-1, not tested + OS: ubuntu-latest + ARTIFACT_NAME: linux-arm - TARGET: x86_64-apple-darwin OS: macos-latest + ARTIFACT_NAME: macos-x86_64 - TARGET: aarch64-apple-darwin OS: macos-latest + ARTIFACT_NAME: macos-aarch64 - TARGET: x86_64-pc-windows-msvc OS: windows-latest + ARTIFACT_NAME: windows-x86_64 - - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested - OS: ubuntu-latest - - TARGET: armv7-unknown-linux-musleabi # raspberry pi 2-3-4, not tested - OS: ubuntu-latest - - TARGET: arm-unknown-linux-musleabihf # raspberry pi 0-1, not tested - OS: ubuntu-latest - - TARGET: arm-unknown-linux-musleabi # raspberry pi 0-1, not tested - OS: ubuntu-latest runs-on: ${{ matrix.OS }} env: NAME: easytier @@ -129,13 +140,13 @@ jobs: mv ./target/$TARGET/release/easytier-core"$SUFFIX" ./artifacts/objects/ mv ./target/$TARGET/release/easytier-cli"$SUFFIX" ./artifacts/objects/ - tar -cvf ./artifacts/$NAME-$TARGET-$TAG.tar -C ./artifacts/objects/ . + mv ./artifacts/objects/* ./artifacts/ rm -rf ./artifacts/objects/ - name: Archive artifact uses: actions/upload-artifact@v4 with: - name: easytier-${{ matrix.OS }}-${{ matrix.TARGET }} + name: easytier-${{ matrix.ARTIFACT_NAME }} path: | ./artifacts/* diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml index 8434aeb..7578be8 100644 --- a/.github/workflows/gui.yml +++ b/.github/workflows/gui.yml @@ -37,20 +37,26 @@ jobs: - TARGET: aarch64-unknown-linux-musl OS: ubuntu-latest GUI_TARGET: aarch64-unknown-linux-gnu + ARTIFACT_NAME: linux-aarch64 - TARGET: x86_64-unknown-linux-musl OS: ubuntu-latest GUI_TARGET: x86_64-unknown-linux-gnu + ARTIFACT_NAME: linux-x86_64 - TARGET: x86_64-apple-darwin OS: macos-latest GUI_TARGET: x86_64-apple-darwin + ARTIFACT_NAME: macos-x86_64 - TARGET: aarch64-apple-darwin OS: macos-latest GUI_TARGET: aarch64-apple-darwin + ARTIFACT_NAME: macos-aarch64 - TARGET: x86_64-pc-windows-msvc OS: windows-latest GUI_TARGET: x86_64-pc-windows-msvc + ARTIFACT_NAME: windows-x86_64 + runs-on: ${{ matrix.OS }} env: NAME: easytier @@ -172,13 +178,13 @@ jobs: fi fi - tar -cvf ./artifacts/$NAME-$TARGET-$TAG.tar -C ./artifacts/objects/ . + mv ./artifacts/objects/* ./artifacts/ rm -rf ./artifacts/objects/ - name: Archive artifact uses: actions/upload-artifact@v4 with: - name: easytier-gui-${{ matrix.OS }}-${{ matrix.TARGET }} + name: easytier-gui-${{ matrix.ARTIFACT_NAME }} path: | ./artifacts/* diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index 7afc593..3b285ca 100644 --- a/.github/workflows/mobile.yml +++ b/.github/workflows/mobile.yml @@ -36,6 +36,7 @@ jobs: include: - TARGET: android OS: ubuntu-latest + ARTIFACT_NAME: android runs-on: ${{ matrix.OS }} env: NAME: easytier @@ -130,13 +131,13 @@ jobs: TAG=$GITHUB_SHA fi - tar -cvf ./artifacts/$NAME-$TARGET-$TAG.tar -C ./artifacts/objects/ . + mv ./artifacts/objects/* ./artifacts rm -rf ./artifacts/objects/ - name: Archive artifact uses: actions/upload-artifact@v4 with: - name: easytier-gui-${{ matrix.TARGET }} + name: easytier-gui-${{ matrix.ARTIFACT_NAME }} path: | ./artifacts/*