From bd279f51f566fb21ed58748b4d903ca796221dc8 Mon Sep 17 00:00:00 2001 From: Mehmet Samet Duman Date: Thu, 2 Apr 2026 21:44:28 +0300 Subject: NOISSUE fixed paths in meshmc actions Signed-off-by: Mehmet Samet Duman --- .github/actions/meshmc/package/linux/action.yml | 14 +++++----- .github/actions/meshmc/package/macos/action.yml | 12 ++++----- .github/actions/meshmc/package/windows/action.yml | 32 +++++++++++------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/actions/meshmc/package/linux/action.yml b/.github/actions/meshmc/package/linux/action.yml index 457ccb27ed..f6eb6f455e 100644 --- a/.github/actions/meshmc/package/linux/action.yml +++ b/.github/actions/meshmc/package/linux/action.yml @@ -65,8 +65,8 @@ runs: shell: bash env: VERSION: ${{ github.ref_type == 'tag' && github.ref_name || inputs.version }} - BUILD_DIR: build - INSTALL_APPIMAGE_DIR: install-appdir + BUILD_DIR: meshmc/build + INSTALL_APPIMAGE_DIR: meshmc/install-appdir GPG_PRIVATE_KEY: ${{ inputs.gpg-private-key }} run: | @@ -114,9 +114,9 @@ runs: - name: Package portable tarball shell: bash env: - BUILD_DIR: build + BUILD_DIR: meshmc/build - INSTALL_PORTABLE_DIR: install-portable + INSTALL_PORTABLE_DIR: meshmc/install-portable run: | cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable @@ -138,16 +138,16 @@ runs: uses: actions/upload-artifact@v7 with: name: MeshMC-${{ inputs.artifact-name }}-Qt6-Portable-${{ inputs.version }}-${{ inputs.build-type }} - path: MeshMC-portable.tar.gz + path: meshmc/MeshMC-portable.tar.gz - name: Upload AppImage uses: actions/upload-artifact@v7 with: name: MeshMC-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage - path: MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage + path: meshmc/MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage - name: Upload AppImage Zsync uses: actions/upload-artifact@v7 with: name: MeshMC-${{ runner.os }}-${{ inputs.version }}-${{ inputs.build-type }}-${{ env.APPIMAGE_ARCH }}.AppImage.zsync - path: MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage.zsync + path: meshmc/MeshMC-${{ runner.os }}-*${{ env.APPIMAGE_ARCH }}.AppImage.zsync diff --git a/.github/actions/meshmc/package/macos/action.yml b/.github/actions/meshmc/package/macos/action.yml index 2a1c432a6d..dbace37295 100644 --- a/.github/actions/meshmc/package/macos/action.yml +++ b/.github/actions/meshmc/package/macos/action.yml @@ -56,8 +56,8 @@ runs: - name: Package shell: bash env: - BUILD_DIR: build - INSTALL_DIR: install + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install run: | cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} @@ -77,7 +77,7 @@ runs: - name: Notarize shell: bash env: - INSTALL_DIR: install + INSTALL_DIR: meshmc/install run: | cd ${{ env.INSTALL_DIR }} @@ -98,7 +98,7 @@ runs: - name: Create DMG shell: bash env: - INSTALL_DIR: install + INSTALL_DIR: meshmc/install run: | cd ${{ env.INSTALL_DIR }} @@ -137,10 +137,10 @@ runs: uses: actions/upload-artifact@v7 with: name: MeshMC-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }} - path: MeshMC.zip + path: meshmc/MeshMC.zip - name: Upload disk image uses: actions/upload-artifact@v7 with: name: MeshMC-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }}.dmg - path: MeshMC.dmg + path: meshmc/MeshMC.dmg diff --git a/.github/actions/meshmc/package/windows/action.yml b/.github/actions/meshmc/package/windows/action.yml index 33e3d42718..e6c14c9083 100644 --- a/.github/actions/meshmc/package/windows/action.yml +++ b/.github/actions/meshmc/package/windows/action.yml @@ -30,8 +30,8 @@ runs: if: ${{ inputs.msystem != '' }} shell: msys2 {0} env: - BUILD_DIR: build - INSTALL_DIR: install + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install run: | cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} touch ${{ env.INSTALL_DIR }}/manifest.txt @@ -41,8 +41,8 @@ runs: if: ${{ inputs.msystem == '' }} shell: pwsh env: - BUILD_DIR: build - INSTALL_DIR: install + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install run: | cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} @@ -58,7 +58,7 @@ runs: - name: Sign executable shell: pwsh env: - INSTALL_DIR: install + INSTALL_DIR: meshmc/install run: | if (Get-Content ./codesign.pfx){ cd ${{ env.INSTALL_DIR }} @@ -72,9 +72,9 @@ runs: if: ${{ inputs.msystem != '' }} shell: msys2 {0} env: - BUILD_DIR: build - INSTALL_DIR: install - INSTALL_PORTABLE_DIR: install-portable + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install + INSTALL_PORTABLE_DIR: meshmc/install-portable run: | cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }} # cmake install on Windows is slow, let's just copy instead cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable @@ -84,9 +84,9 @@ runs: if: ${{ inputs.msystem == '' }} shell: pwsh env: - BUILD_DIR: build - INSTALL_DIR: install - INSTALL_PORTABLE_DIR: install-portable + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install + INSTALL_PORTABLE_DIR: meshmc/install-portable run: | cp -r ${{ env.INSTALL_DIR }} ${{ env.INSTALL_PORTABLE_DIR }} # cmake install on Windows is slow, let's just copy instead cmake --install ${{ env.BUILD_DIR }} --config ${{ inputs.build-type }} --prefix ${{ env.INSTALL_PORTABLE_DIR }} --component portable @@ -96,8 +96,8 @@ runs: - name: Package (installer) shell: pwsh env: - BUILD_DIR: build - INSTALL_DIR: install + BUILD_DIR: meshmc/build + INSTALL_DIR: meshmc/install NSCURL_VERSION: "v24.9.26.122" NSCURL_SHA256: "AEE6C4BE3CB6455858E9C1EE4B3AFE0DB9960FA03FE99CCDEDC28390D57CCBB0" @@ -127,16 +127,16 @@ runs: uses: actions/upload-artifact@v5 with: name: MeshMC-${{ inputs.artifact-name }}-${{ inputs.version }}-${{ inputs.build-type }} - path: install/** + path: meshmc/install/** - name: Upload portable zip uses: actions/upload-artifact@v5 with: name: MeshMC-${{ inputs.artifact-name }}-Portable-${{ inputs.version }}-${{ inputs.build-type }} - path: install-portable/** + path: meshmc/install-portable/** - name: Upload installer uses: actions/upload-artifact@v5 with: name: MeshMC-${{ inputs.artifact-name }}-Setup-${{ inputs.version }}-${{ inputs.build-type }} - path: MeshMC-Setup.exe + path: meshmc/MeshMC-Setup.exe -- cgit 0.0.5-2-1-g0f52