From 51b0150718e97ef69501655d1758d13fc266b138 Mon Sep 17 00:00:00 2001 From: Kenneth VanderLinde Date: Sun, 19 Nov 2023 01:42:42 -0800 Subject: [PATCH] Avoid failure when touching up asset names Instead of `cp`, using `mv` has some nicer behaviour on Windows and Mac OS, while also being decent on Linux too. Cherry pick of 4e86d6871 --- .github/workflows/publish.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 93b7d3b007..846c63fd0a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -68,11 +68,11 @@ jobs: # | |/ |/ // // / / // /_/ // /_/ /| |/ |/ /(__ ) # |__/|__//_//_/ /_/ \__,_/ \____/ |__/|__//____/ # - - name: Copy Windows Release Files + - name: Rename Windows Release Files if: matrix.os == 'windows-latest' run: | - cp releases/MapTool*.exe releases/MapTool-${{ github.event.release.tag_name }}.exe - cp releases/MapTool*.msi releases/MapTool-${{ github.event.release.tag_name }}.msi + mv releases/MapTool*.exe releases/MapTool-${{ github.event.release.tag_name }}.exe + mv releases/MapTool*.msi releases/MapTool-${{ github.event.release.tag_name }}.msi continue-on-error: true - name: Upload Windows EXE Release Asset id: upload-release-asset-exe @@ -113,12 +113,12 @@ jobs: # / /___ / // / / // /_/ /_> < # /_____//_//_/ /_/ \__,_//_/|_| # - - name: Copy Linux Release Files + - name: Rename Linux Release Files if: matrix.os == 'ubuntu-latest' run: | - cp releases/maptool*.x86_64.rpm releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm - cp releases/maptool*_amd64.deb releases/maptool_${{ github.event.release.tag_name }}_amd64.deb - cp package/archlinux/maptool/maptool-*-x86_64.pkg.tar.zst releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst + mv -n releases/maptool*.x86_64.rpm releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm + mv -n releases/maptool*_amd64.deb releases/maptool_${{ github.event.release.tag_name }}_amd64.deb + mv -n package/archlinux/maptool/maptool-*-x86_64.pkg.tar.zst releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst continue-on-error: true - name: Upload Linux RPM Release Asset id: upload-release-asset-rpm @@ -159,11 +159,11 @@ jobs: # / / / / / // /_/ // /__ / /_/ /___/ / # /_/ /_/ /_/ \__,_/ \___/ \____//____/ # - - name: Copy Mac OS Release Files + - name: Rename Mac OS Release Files if: matrix.os == 'macOS-13' run: | - cp releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg - cp releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg + mv releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg + mv releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg continue-on-error: true - name: Upload Mac DMG Release Asset id: upload-release-asset-dmg