From a08181e8356666961935631d31319878ece1f489 Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 10:04:55 +0800 Subject: [PATCH 1/6] :bug: fix: release workflow --- .github/workflows/release.yml | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a03cf2..b5d1bb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,18 +44,18 @@ jobs: with: name: admin-${{ matrix.os }}-${{ matrix.arch }} path: | - admin - public - config/*.yml + admin + public + config/*.yml - name: Archive artifact exe if: matrix.os == 'windows' uses: actions/upload-artifact@v4 with: name: admin-${{ matrix.os }}-${{ matrix.arch }} path: | - admin.exe - public - config/*.yml + admin.exe + public + config/*.yml release: runs-on: ubuntu-latest @@ -64,10 +64,15 @@ jobs: - name: Download artifact uses: actions/download-artifact@v4 - - name: Add exe + - name: Package run: | - mv admin-windows-amd64/admin-windows-amd64 admin-windows-amd64/admin-windows-amd64.exe - mv admin-windows-arm64/admin-windows-arm64 admin-windows-arm64/admin-windows-arm64.exe + zip admin-linux-amd64.zip admin-linux-amd64 + zip admin-linux-arm64.zip admin-linux-arm64 + zip admin-darwin-amd64.zip admin-darwin-amd64 + zip admin-darwin-arm64.zip admin-darwin-arm64 + zip admin-windows-amd64.zip admin-windows-amd64 + zip admin-windows-arm64.zip admin-windows-arm64 + - name: Get version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} @@ -77,12 +82,12 @@ jobs: with: generate_release_notes: true files: | - admin-linux-amd64/admin-linux-amd64 - admin-linux-arm64/admin-linux-arm64 - admin-darwin-amd64/admin-darwin-amd64 - admin-darwin-arm64/admin-darwin-arm64 - admin-windows-amd64/admin-windows-amd64.exe - admin-windows-arm64/admin-windows-arm64.exe + admin-linux-amd64.zip + admin-linux-arm64.zip + admin-darwin-amd64.zip + admin-darwin-arm64.zip + admin-windows-amd64.zip + admin-windows-arm64.zip prerelease: false body: | ## Pull Image From a92400b9599a5da0191520845007c6043d96adc2 Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 10:14:42 +0800 Subject: [PATCH 2/6] :bug: fix: release workflow --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ba910c..852de07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + if: github.event_name != 'pull_request' + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx if: github.event_name != 'pull_request' uses: docker/setup-buildx-action@v3 From ef1b6c967a19a6be69b6553c2ae2824297f53ff9 Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 11:13:37 +0800 Subject: [PATCH 3/6] :bug: fix: release workflow --- .github/workflows/release.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5d1bb4..a5bcb96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,18 +44,18 @@ jobs: with: name: admin-${{ matrix.os }}-${{ matrix.arch }} path: | - admin - public - config/*.yml - - name: Archive artifact exe + admin + public + config/*.yml + - name: Archive artifact if: matrix.os == 'windows' uses: actions/upload-artifact@v4 with: name: admin-${{ matrix.os }}-${{ matrix.arch }} path: | - admin.exe - public - config/*.yml + admin.exe + public + config/*.yml release: runs-on: ubuntu-latest @@ -66,12 +66,12 @@ jobs: - name: Package run: | - zip admin-linux-amd64.zip admin-linux-amd64 - zip admin-linux-arm64.zip admin-linux-arm64 - zip admin-darwin-amd64.zip admin-darwin-amd64 - zip admin-darwin-arm64.zip admin-darwin-arm64 - zip admin-windows-amd64.zip admin-windows-amd64 - zip admin-windows-arm64.zip admin-windows-arm64 + zip admin-linux-amd64.zip admin-linux-amd64 + zip admin-linux-arm64.zip admin-linux-arm64 + zip admin-darwin-amd64.zip admin-darwin-amd64 + zip admin-darwin-arm64.zip admin-darwin-arm64 + zip admin-windows-amd64.zip admin-windows-amd64 + zip admin-windows-arm64.zip admin-windows-arm64 - name: Get version id: get_version From e039053d1cfcbfa1408e3ec3cf055e925b2171a8 Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 15:41:20 +0000 Subject: [PATCH 4/6] test --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5bcb96..a1efbfc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,7 @@ jobs: - name: Package run: | + ls zip admin-linux-amd64.zip admin-linux-amd64 zip admin-linux-arm64.zip admin-linux-arm64 zip admin-darwin-amd64.zip admin-darwin-amd64 From 38603921266112920d56a2609a848189df1cd0ef Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 15:52:16 +0000 Subject: [PATCH 5/6] test --- .github/workflows/release.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1efbfc..cfd800a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,12 @@ jobs: - name: Package run: | - ls - zip admin-linux-amd64.zip admin-linux-amd64 - zip admin-linux-arm64.zip admin-linux-arm64 - zip admin-darwin-amd64.zip admin-darwin-amd64 - zip admin-darwin-arm64.zip admin-darwin-arm64 - zip admin-windows-amd64.zip admin-windows-amd64 - zip admin-windows-arm64.zip admin-windows-arm64 + zip -r admin-linux-amd64.zip admin-linux-amd64 + zip -r admin-linux-arm64.zip admin-linux-arm64 + zip -r admin-darwin-amd64.zip admin-darwin-amd64 + zip -r admin-darwin-arm64.zip admin-darwin-arm64 + zip -r admin-windows-amd64.zip admin-windows-amd64 + zip -r admin-windows-arm64.zip admin-windows-arm64 - name: Get version id: get_version From fe9d1bb601a6d5f9ad135cb52153958ba1a0b66b Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Wed, 24 Jul 2024 16:29:58 +0000 Subject: [PATCH 6/6] test --- .github/workflows/release.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cfd800a..7a774e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,6 +64,24 @@ jobs: - name: Download artifact uses: actions/download-artifact@v4 + - name: Get latest release version + id: get_release + run: | + LATEST_RELEASE=$(curl -s https://api.github.com/repos/mss-boot-io/mss-boot-admin-antd/releases/latest) + VERSION=$(echo $LATEST_RELEASE | jq -r '.tag_name') + echo "LATEST_RELEASE_VERSION=${VERSION}" >> $GITHUB_ENV + + - name: Download dist-local.tar.gz + run: | + wget https://github.com/mss-boot-io/mss-boot-admin-antd/releases/download/${{ env.LATEST_RELEASE_VERSION }}/dist-local.tar.gz + tar -zxvf dist-local.tar.gz + cp -r dist admin-linux-amd64/ + cp -r dist admin-linux-arm64/ + cp -r dist admin-darwin-amd64/ + cp -r dist admin-darwin-arm64/ + cp -r dist admin-windows-amd64/ + cp -r dist admin-windows-arm64/ + - name: Package run: | zip -r admin-linux-amd64.zip admin-linux-amd64