diff --git a/.github/workflows/push_pull.yml b/.github/workflows/push_pull.yml index add2c9440..2517d008e 100644 --- a/.github/workflows/push_pull.yml +++ b/.github/workflows/push_pull.yml @@ -28,7 +28,7 @@ jobs: qt_version: ${{ matrix.qt_version }} event_name: ${{ github.event_name }} pull_request_number: ${{ github.event.pull_request.number }} - publish: ${{ startsWith(github.event.ref, 'refs/tags') }} + publish: ${{ startsWith(github.event.ref, 'refs/tags') && matrix.qt_version == '5' }} # Build DEB/RPM Packages for APT/DNF Repository (runs only on tagged commits) repo_build: diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml index 75a29975b..553e73fd3 100644 --- a/.github/workflows/qt5_6.yml +++ b/.github/workflows/qt5_6.yml @@ -86,7 +86,7 @@ jobs: if: ${{ inputs.publish || inputs.event_name == 'pull_request' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.event_name == 'pull_request' && env.NAME || 'artifact' }} + name: ${{ inputs.event_name == 'pull_request' && env.NAME || format('artifact-{0}', env.NAME) }} path: ${{ inputs.event_name == 'pull_request' && 'deploy/*.tar.gz' || 'deploy/Hyperion-*' }} env: NAME: ${{ format('{0}_{1}_{2}{3}', matrix.os.distribution, matrix.os.codename, matrix.os.architecture[0], inputs.qt_version == '6' && '_qt6' || '') }} @@ -130,7 +130,7 @@ jobs: if: ${{ inputs.publish || inputs.event_name == 'pull_request' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.event_name == 'pull_request' && env.NAME || 'artifact' }} + name: ${{ inputs.event_name == 'pull_request' && env.NAME || format('artifact-{0}', env.NAME) }} path: 'build/Hyperion-*' env: NAME: ${{ inputs.qt_version == '6' && 'macOS_x64_qt6' || 'macOS_x64' }} @@ -200,7 +200,7 @@ jobs: if: ${{ inputs.publish || inputs.event_name == 'pull_request' }} uses: actions/upload-artifact@v4 with: - name: ${{ inputs.event_name == 'pull_request' && env.NAME || 'artifact' }} + name: ${{ inputs.event_name == 'pull_request' && env.NAME || format('artifact-{0}', env.NAME) }} path: ${{ inputs.event_name == 'pull_request' && 'build/*.exe' || 'build/Hyperion-*' }} env: NAME: ${{ inputs.qt_version == '6' && 'windows_x64_qt6' || 'windows_x64' }} @@ -228,14 +228,15 @@ jobs: - name: 💾 Artifact download uses: actions/download-artifact@v4.1.0 with: - path: artifacts + pattern: artifact-* + path: all-artifacts - name: 📦 Upload uses: softprops/action-gh-release@v1 with: name: Hyperion ${{ env.VERSION }} tag_name: ${{ env.TAG }} - files: "artifacts/**" + files: "all-artifacts/**" draft: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}