From 57bc63cff4edaa3af5b6aa8a9e835057c587e803 Mon Sep 17 00:00:00 2001 From: Mehmet Samet Duman Date: Thu, 29 Oct 2026 20:15:27 +0300 Subject: [PATCH] Fixed CI to generate artifact names Signed-off-by: Mehmet Samet Duman --- .github/actions/package/linux/action.yml | 6 +- .github/actions/package/macos/action.yml | 4 +- .github/actions/package/windows/action.yml | 6 +- .github/workflows/release.yml | 106 ++++++++++----------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.github/actions/package/linux/action.yml b/.github/actions/package/linux/action.yml index 4096e2329..ff27e7240 100644 --- a/.github/actions/package/linux/action.yml +++ b/.github/actions/package/linux/action.yml @@ -163,17 +163,17 @@ runs: - name: Upload portable tarball uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-Qt${{ inputs.qt-major }}-Portable-${{ inputs.version }}-${{ inputs.build-type }} + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-Portable-${{ inputs.version }}-${{ inputs.build-type }} path: MeshMC-portable.tar.gz - name: Upload AppImage uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ runner.os }}-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage + name: MeshMC-Qt${{ inputs.qt-major }}-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage path: MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage - name: Upload AppImage Zsync uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ runner.os }}-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage.zsync + name: MeshMC-Qt${{ inputs.qt-major }}-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage.zsync path: MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage.zsync diff --git a/.github/actions/package/macos/action.yml b/.github/actions/package/macos/action.yml index 0b701076f..c6f103daa 100644 --- a/.github/actions/package/macos/action.yml +++ b/.github/actions/package/macos/action.yml @@ -183,11 +183,11 @@ runs: - name: Upload binary tarball uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }} + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }} path: MeshMC.zip - name: Upload disk image uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }}-Qt${{ inputs.qt-major }}.dmg + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}.dmg path: MeshMC.dmg diff --git a/.github/actions/package/windows/action.yml b/.github/actions/package/windows/action.yml index 79f4375ab..435a89937 100644 --- a/.github/actions/package/windows/action.yml +++ b/.github/actions/package/windows/action.yml @@ -160,17 +160,17 @@ runs: - name: Upload binary zip uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}-Qt${{ inputs.qt-major }} + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }} path: ${{ github.workspace }}/install/** - name: Upload portable zip uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-Portable-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }} + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-Portable-${{ inputs.version }}-${{ inputs.build-type }} path: ${{ github.workspace }}/install-portable/** - name: Upload installer uses: actions/upload-artifact@v7 with: - name: MeshMC-${{ inputs.artifact-name }}-Setup-Qt${{ inputs.qt-major }}-${{ inputs.version }}-${{ inputs.build-type }} + name: MeshMC-Qt${{ inputs.qt-major }}-${{ inputs.artifact-name }}-Setup-${{ inputs.version }}-${{ inputs.build-type }} path: ${{ github.workspace }}/MeshMC-Setup.exe diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6824ca0d8..64964f807 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,31 +42,31 @@ jobs: - name: Package artifacts properly run: | mv ${{ github.workspace }}/MeshMC-source MeshMC-${{ env.VERSION }} - mv MeshMC-Linux-Qt5-Portable*/MeshMC-portable.tar.gz MeshMC-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz - mv MeshMC-Linux-Qt6-Portable*/MeshMC-portable.tar.gz MeshMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz - mv MeshMC-Linux-aarch64-Qt6-Portable*/MeshMC-portable.tar.gz MeshMC-Linux-aarch64-Qt6-Portable-${{ env.VERSION }}.tar.gz - mv MeshMC-Linux-Qt5*.AppImage/MeshMC-*-x86_64.AppImage MeshMC-Linux-Qt5-x86_64.AppImage - mv MeshMC-Linux-Qt5*.AppImage.zsync/MeshMC-*-x86_64.AppImage.zsync MeshMC-Linux-Qt5-x86_64.AppImage.zsync - mv MeshMC-Linux-Qt6*.AppImage/MeshMC-*-x86_64.AppImage MeshMC-Linux-Qt6-x86_64.AppImage - mv MeshMC-Linux-Qt6*.AppImage.zsync/MeshMC-*-x86_64.AppImage.zsync MeshMC-Linux-Qt6-x86_64.AppImage.zsync - mv MeshMC-Linux-Qt6*.AppImage/MeshMC-*-aarch64.AppImage MeshMC-Linux-Qt6-aarch64.AppImage - mv MeshMC-Linux-Qt6*.AppImage.zsync/MeshMC-*-aarch64.AppImage.zsync MeshMC-Linux-Qt6-aarch64.AppImage.zsync - mv MeshMC-macOS-ARM-Qt5*/MeshMC.zip MeshMC-macOS-ARM-Qt5-${{ env.VERSION }}.zip - mv MeshMC-macOS-ARM-Qt5*/MeshMC.dmg MeshMC-macOS-ARM-Qt5-${{ env.VERSION }}.dmg - mv MeshMC-macOS-Qt6*/MeshMC.zip MeshMC-macOS-Qt6-${{ env.VERSION }}.zip - mv MeshMC-macOS-Qt6*/MeshMC.dmg MeshMC-macOS-Qt6-${{ env.VERSION }}.dmg - mv MeshMC-macOS-Legacy-Qt6*/MeshMC.zip MeshMC-macOS-Legacy-Qt6-${{ env.VERSION }}.zip - mv MeshMC-macOS-Legacy-Qt6*/MeshMC.dmg MeshMC-macOS-Legacy-Qt6-${{ env.VERSION }}.dmg + mv MeshMC-Qt5-Linux-Portable*/MeshMC-portable.tar.gz MeshMC-Qt5-Linux-Portable-${{ env.VERSION }}.tar.gz + mv MeshMC-Qt6-Linux-Portable*/MeshMC-portable.tar.gz MeshMC-Qt6-Linux-Portable-${{ env.VERSION }}.tar.gz + mv MeshMC-Qt6-Linux-aarch64-Portable*/MeshMC-portable.tar.gz MeshMC-Qt6-Linux-aarch64-Portable-${{ env.VERSION }}.tar.gz + mv MeshMC-Qt5-Linux*.AppImage/MeshMC-*-x86_64.AppImage MeshMC-Qt5-Linux-x86_64.AppImage + mv MeshMC-Qt5-Linux*.AppImage.zsync/MeshMC-*-x86_64.AppImage.zsync MeshMC-Qt5-Linux-x86_64.AppImage.zsync + mv MeshMC-Qt6-Linux*.AppImage/MeshMC-*-x86_64.AppImage MeshMC-Qt6-Linux-x86_64.AppImage + mv MeshMC-Qt6-Linux*.AppImage.zsync/MeshMC-*-x86_64.AppImage.zsync MeshMC-Qt6-Linux-x86_64.AppImage.zsync + mv MeshMC-Qt6-Linux*.AppImage/MeshMC-*-aarch64.AppImage MeshMC-Qt6-Linux-aarch64.AppImage + mv MeshMC-Qt6-Linux*.AppImage.zsync/MeshMC-*-aarch64.AppImage.zsync MeshMC-Qt6-Linux-aarch64.AppImage.zsync + mv MeshMC-Qt5-macOS-ARM*/MeshMC.zip MeshMC-Qt5-macOS-ARM-${{ env.VERSION }}.zip + mv MeshMC-Qt5-macOS-ARM*/MeshMC.dmg MeshMC-Qt5-macOS-ARM-${{ env.VERSION }}.dmg + mv MeshMC-Qt6-macOS*/MeshMC.zip MeshMC-Qt6-macOS-${{ env.VERSION }}.zip + mv MeshMC-Qt6-macOS*/MeshMC.dmg MeshMC-Qt6-macOS-${{ env.VERSION }}.dmg + mv MeshMC-Qt6-macOS-Legacy*/MeshMC.zip MeshMC-Qt6-macOS-Legacy-${{ env.VERSION }}.zip + mv MeshMC-Qt6-macOS-Legacy*/MeshMC.dmg MeshMC-Qt6-macOS-Legacy-${{ env.VERSION }}.dmg tar --exclude='.git' -czf MeshMC-${{ env.VERSION }}.tar.gz MeshMC-${{ env.VERSION }} - for d in MeshMC-Windows-MSVC-Qt5*; do + for d in MeshMC-Qt5-Windows-MSVC*; do cd "${d}" || continue LEGACY="$(echo -n ${d} | grep -o Legacy || true)" ARM64="$(echo -n ${d} | grep -o arm64 || true)" INST="$(echo -n ${d} | grep -o Setup || true)" PORT="$(echo -n ${d} | grep -o Portable || true)" - NAME="MeshMC-Windows-MSVC-Qt5" + NAME="MeshMC-Qt5-Windows-MSVC" test -z "${LEGACY}" || NAME="${NAME}-Legacy" test -z "${ARM64}" || NAME="${NAME}-arm64" test -z "${PORT}" || NAME="${NAME}-Portable" @@ -75,13 +75,13 @@ jobs: cd .. done - for d in MeshMC-Windows-MSVC-Qt6*; do + for d in MeshMC-Qt6-Windows-MSVC*; do cd "${d}" || continue LEGACY="$(echo -n ${d} | grep -o Legacy || true)" ARM64="$(echo -n ${d} | grep -o arm64 || true)" INST="$(echo -n ${d} | grep -o Setup || true)" PORT="$(echo -n ${d} | grep -o Portable || true)" - NAME="MeshMC-Windows-MSVC-Qt6" + NAME="MeshMC-Qt6-Windows-MSVC" test -z "${LEGACY}" || NAME="${NAME}-Legacy" test -z "${ARM64}" || NAME="${NAME}-arm64" test -z "${PORT}" || NAME="${NAME}-Portable" @@ -90,22 +90,22 @@ jobs: cd .. done - for d in MeshMC-Windows-MinGW-Qt5-w64*; do + for d in MeshMC-Qt5-Windows-MinGW-w64*; do cd "${d}" || continue INST="$(echo -n ${d} | grep -o Setup || true)" PORT="$(echo -n ${d} | grep -o Portable || true)" - NAME="MeshMC-Windows-MinGW-Qt5-w64" + NAME="MeshMC-Qt5-Windows-MinGW-w64" test -z "${PORT}" || NAME="${NAME}-Portable" test -z "${INST}" || mv MeshMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" * cd .. done - for d in MeshMC-Windows-MinGW-Qt6-w64*; do + for d in MeshMC-Qt6-Windows-MinGW-w64*; do cd "${d}" || continue INST="$(echo -n ${d} | grep -o Setup || true)" PORT="$(echo -n ${d} | grep -o Portable || true)" - NAME="MeshMC-Windows-MinGW-Qt6-w64" + NAME="MeshMC-Qt6-Windows-MinGW-w64" test -z "${PORT}" || NAME="${NAME}-Portable" test -z "${INST}" || mv MeshMC-*.exe ../${NAME}-Setup-${{ env.VERSION }}.exe test -n "${INST}" || zip -r -9 "../${NAME}-${{ env.VERSION }}.zip" * @@ -123,34 +123,34 @@ jobs: prerelease: false fail_on_unmatched_files: true files: | - MeshMC-Linux-Qt5-x86_64.AppImage - MeshMC-Linux-Qt5-x86_64.AppImage.zsync - MeshMC-Linux-Qt6-x86_64.AppImage - MeshMC-Linux-Qt6-x86_64.AppImage.zsync - MeshMC-Linux-Qt6-aarch64.AppImage - MeshMC-Linux-Qt6-aarch64.AppImage.zsync - MeshMC-Linux-Qt5-Portable-${{ env.VERSION }}.tar.gz - MeshMC-Linux-Qt6-Portable-${{ env.VERSION }}.tar.gz - MeshMC-Linux-aarch64-Qt6-Portable-${{ env.VERSION }}.tar.gz - MeshMC-Windows-MinGW-Qt5-w64-${{ env.VERSION }}.zip - MeshMC-Windows-MinGW-Qt5-w64-Portable-${{ env.VERSION }}.zip - MeshMC-Windows-MinGW-Qt5-w64-Setup-${{ env.VERSION }}.exe - MeshMC-Windows-MinGW-Qt6-w64-${{ env.VERSION }}.zip - MeshMC-Windows-MinGW-Qt6-w64-Portable-${{ env.VERSION }}.zip - MeshMC-Windows-MinGW-Qt6-w64-Setup-${{ env.VERSION }}.exe - MeshMC-Windows-MSVC-Qt6-arm64-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt6-arm64-Portable-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt6-arm64-Setup-${{ env.VERSION }}.exe - MeshMC-Windows-MSVC-Qt5-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt5-Portable-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt5-Setup-${{ env.VERSION }}.exe - MeshMC-Windows-MSVC-Qt6-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt6-Portable-${{ env.VERSION }}.zip - MeshMC-Windows-MSVC-Qt6-Setup-${{ env.VERSION }}.exe - MeshMC-macOS-ARM-Qt5-${{ env.VERSION }}.zip - MeshMC-macOS-ARM-Qt5-${{ env.VERSION }}.dmg - MeshMC-macOS-Qt6-${{ env.VERSION }}.zip - MeshMC-macOS-Qt6-${{ env.VERSION }}.dmg - MeshMC-macOS-Legacy-Qt6-${{ env.VERSION }}.zip - MeshMC-macOS-Legacy-Qt6-${{ env.VERSION }}.dmg + MeshMC-Qt5-Linux-x86_64.AppImage + MeshMC-Qt5-Linux-x86_64.AppImage.zsync + MeshMC-Qt6-Linux-x86_64.AppImage + MeshMC-Qt6-Linux-x86_64.AppImage.zsync + MeshMC-Qt6-Linux-aarch64.AppImage + MeshMC-Qt6-Linux-aarch64.AppImage.zsync + MeshMC-Qt5-Linux-Portable-${{ env.VERSION }}.tar.gz + MeshMC-Qt6-Linux-Portable-${{ env.VERSION }}.tar.gz + MeshMC-Qt6-Linux-aarch64-Portable-${{ env.VERSION }}.tar.gz + MeshMC-Qt5-Windows-MinGW-w64-${{ env.VERSION }}.zip + MeshMC-Qt5-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip + MeshMC-Qt5-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe + MeshMC-Qt6-Windows-MinGW-w64-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MinGW-w64-Portable-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MinGW-w64-Setup-${{ env.VERSION }}.exe + MeshMC-Qt6-Windows-MSVC-arm64-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MSVC-arm64-Portable-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MSVC-arm64-Setup-${{ env.VERSION }}.exe + MeshMC-Qt5-Windows-MSVC-${{ env.VERSION }}.zip + MeshMC-Qt5-Windows-MSVC-Portable-${{ env.VERSION }}.zip + MeshMC-Qt5-Windows-MSVC-Setup-${{ env.VERSION }}.exe + MeshMC-Qt6-Windows-MSVC-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MSVC-Portable-${{ env.VERSION }}.zip + MeshMC-Qt6-Windows-MSVC-Setup-${{ env.VERSION }}.exe + MeshMC-Qt5-macOS-ARM-${{ env.VERSION }}.zip + MeshMC-Qt5-macOS-ARM-${{ env.VERSION }}.dmg + MeshMC-Qt6-macOS-${{ env.VERSION }}.zip + MeshMC-Qt6-macOS-${{ env.VERSION }}.dmg + MeshMC-Qt6-macOS-Legacy-${{ env.VERSION }}.zip + MeshMC-Qt6-macOS-Legacy-${{ env.VERSION }}.dmg MeshMC-${{ env.VERSION }}.tar.gz