diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2e586ec975..8dcc872fe5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -743,7 +743,7 @@ jobs: "${Env:FULL_INSTALL_FOLDER}.zip" ` "${Env:INSTALL_FOLDER}.zip" Add-Content ` - -Path "${{ env.INSTALL_FOLDER }}.artifact" ` + -Path "release-${{ env.INSTALL_FOLDER }}.artifact" ` -Value "${{ env.INSTALL_FOLDER }}.zip" - uses: actions/upload-artifact@v4 with: @@ -751,8 +751,8 @@ jobs: path: ${{ env.INSTALL_FOLDER }}.zip - uses: actions/upload-artifact@v4 with: - name: "${{ env.INSTALL_FOLDER }}.artifact" - path: "${{ env.INSTALL_FOLDER }}.artifact" + name: "release-${{ env.INSTALL_FOLDER }}.artifact" + path: "release-${{ env.INSTALL_FOLDER }}.artifact" - name: Prepare artifacts with VC++ runtime run: | Set-PSDebug -Trace 2 @@ -820,7 +820,7 @@ jobs: "${Env:FULL_INSTALL_FOLDER_WITH_VCRUNTIME}.zip" ` "${Env:INSTALL_FOLDER_WITH_VCRUNTIME}.zip" Add-Content ` - -Path "${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" ` + -Path "release-${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" ` -Value "${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.zip" - uses: actions/upload-artifact@v4 with: @@ -828,8 +828,8 @@ jobs: path: ${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.zip - uses: actions/upload-artifact@v4 with: - name: "${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" - path: "${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" + name: "release-${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" + path: "release-${{ env.INSTALL_FOLDER_WITH_VCRUNTIME }}.artifact" # Test - uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/document.yml b/.github/workflows/document.yml index 2b2824a79c..3017232efb 100644 --- a/.github/workflows/document.yml +++ b/.github/workflows/document.yml @@ -54,7 +54,7 @@ jobs: version=$(cat base_version) mv /tmp/groonga.org /tmp/document-${version} tar -czf document-${version}.tar.gz -C /tmp/ document-${version} - echo "document-${version}.tar.gz" >> "document-${version}.artifact" + echo "document-${version}.tar.gz" >> "release-document-${version}.artifact" # Artifact - uses: actions/upload-artifact@v4 with: @@ -62,8 +62,8 @@ jobs: path: document-*.tar.gz - uses: actions/upload-artifact@v4 with: - name: "document-${version}.artifact" - path: "document-${version}.artifact" + name: "release-document.artifact" + path: "release-document-*.artifact" release: if: | github.ref_type == 'tag' diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index a8e9b3acb8..f6b49a3459 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -117,8 +117,8 @@ jobs: popd zip -r groonga-${version}.zip groonga-${version} rm -rf groonga-${version} - echo "groonga-${version}.tar.gz" >> "groonga-${version}.artifact" - echo "groonga-${version}.zip" >> "groonga-${version}.artifact" + echo "groonga-${version}.tar.gz" >> "release-groonga-${version}.artifact" + echo "groonga-${version}.zip" >> "release-groonga-${version}.artifact" # Artifact - uses: actions/upload-artifact@v4 @@ -129,8 +129,8 @@ jobs: groonga-*.zip - uses: actions/upload-artifact@v4 with: - name: "groonga-${version}.artifact" - path: "groonga-${version}.artifact" + name: "release-groonga-${version}.artifact" + path: "release-groonga-${version}.artifact" build: name: Build @@ -270,15 +270,15 @@ jobs: - name: Create assets run: | tar czf ${{ matrix.id }}.tar.gz packages/${TASK_NAMESPACE}/repositories/ - echo "${{ matrix.id }}.tar.gz" >> "${{ matrix.id }}.artifact" + echo "${{ matrix.id }}.tar.gz" >> "release-${{ matrix.id }}.artifact" - uses: actions/upload-artifact@v4 with: name: ${{ matrix.id }}.tar.gz path: ${{ matrix.id }}.tar.gz - uses: actions/upload-artifact@v4 with: - name: "${{ matrix.id }}.artifact" - path: "${{ matrix.id }}.artifact" + name: "release-${{ matrix.id }}.artifact" + path: "release-${{ matrix.id }}.artifact" # Test - name: Test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a4df37eb26..e137fef0e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,6 +55,6 @@ jobs: - name: Upload to release run: | cd artifacts - gh release upload "${{ inputs.tag }}" $(cat *.artifact) + gh release upload "${{ inputs.tag }}" $(cat release-*.artifact) env: GH_TOKEN: ${{ secrets.token }}