From ce9919e251ca839744bee85cba0c68acc72611e4 Mon Sep 17 00:00:00 2001 From: Han Yeong-woo Date: Sun, 2 Jun 2024 11:31:58 +0900 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0:=20bump=20actions=20(#1366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-engine-package.yml | 18 +++++++++++++----- .github/workflows/build-latest-dev.yml | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-engine-package.yml b/.github/workflows/build-engine-package.yml index b4a49f305..b43345caf 100644 --- a/.github/workflows/build-engine-package.yml +++ b/.github/workflows/build-engine-package.yml @@ -430,7 +430,7 @@ jobs: if [[ $OS == mac-* ]]; then ditto -x -k --sequesterRsrc --rsrc download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip download/ else - unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ + unzip download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip -d download/ fi mkdir -p download/core mv download/${{ env.VOICEVOX_CORE_ASSET_NAME }}/* download/core @@ -572,9 +572,9 @@ jobs: - name: Upload 7z archives to artifact if: github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ steps.vars.outputs.package_name }} + name: ${{ steps.vars.outputs.package_name }}-7z path: | ${{ steps.vars.outputs.package_name }}.7z.* @@ -617,9 +617,9 @@ jobs: - name: Upload VVPP archives to artifact if: github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: ${{ steps.vars.outputs.package_name }} + name: ${{ steps.vars.outputs.package_name }}-vvpp path: | ${{ steps.vars.outputs.package_name }}.vvpp ${{ steps.vars.outputs.package_name }}*.vvppp @@ -639,6 +639,14 @@ jobs: ${{ steps.vars.outputs.package_name }}.vvpp.txt commit: ${{ github.sha }} + - name: Merge artifacts + if: github.event.inputs.upload_artifact == 'true' + uses: actions/upload-artifact/merge@v4 + with: + name: ${{ steps.vars.outputs.package_name }} + pattern: ${{ steps.vars.outputs.package_name }}-* + delete-merged: true + update-tag-to-current-commit: if: needs.config.outputs.version != '' needs: [config, build-and-upload] diff --git a/.github/workflows/build-latest-dev.yml b/.github/workflows/build-latest-dev.yml index 48007c796..4f2afb6e5 100644 --- a/.github/workflows/build-latest-dev.yml +++ b/.github/workflows/build-latest-dev.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'VOICEVOX' steps: - name: Trigger workflow_dispatch - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: |