diff --git a/.github/workflows/build-artifact.yml b/.github/workflows/build-artifact.yml index 4d77f9c0..51f31ed8 100644 --- a/.github/workflows/build-artifact.yml +++ b/.github/workflows/build-artifact.yml @@ -1,6 +1,5 @@ name: build-artifact on: push - jobs: build-matrix: runs-on: windows-2022 @@ -20,9 +19,8 @@ jobs: call msbuild -m:5 -nologo -p:Configuration="${{ matrix.configuration }}" -p:Platform="${{ matrix.platform }}" if %ERRORLEVEL%==1 exit %ERRORLEVEL% call release.bat ${{ matrix.configuration }} ${{ matrix.platform }} %commithash%_%GITHUB_RUN_ID% - - name: Upload binaries uses: actions/upload-artifact@master with: - name: build-artifacts - path: distribute/*.7z + name: Dn-FamiTracker_${{ matrix.platform }}_${{ matrix.configuration }} + path: distribute/*_${{ matrix.platform }}_${{ matrix.configuration }}.7z diff --git a/.github/workflows/build-release-artifact.yml b/.github/workflows/build-release-artifact.yml index eda7fa31..2ad84ec6 100644 --- a/.github/workflows/build-release-artifact.yml +++ b/.github/workflows/build-release-artifact.yml @@ -18,9 +18,8 @@ jobs: call msbuild -m:5 -nologo -p:Configuration="${{ matrix.configuration }}" -p:Platform="${{ matrix.platform }}" if %ERRORLEVEL%==1 exit %ERRORLEVEL% call release.bat ${{ matrix.configuration }} ${{ matrix.platform }} - - name: Upload binaries uses: actions/upload-artifact@master with: - name: build-artifacts - path: distribute/*.7z + name: Dn-FamiTracker_${{ matrix.platform }}_${{ matrix.configuration }} + path: distribute/*_${{ matrix.platform }}_${{ matrix.configuration }}.7z diff --git a/release.bat b/release.bat index 3690c80f..7c0c9cec 100644 --- a/release.bat +++ b/release.bat @@ -5,11 +5,9 @@ del distribute /q /f mkdir distribute if "%2"=="Win32" ( - set conf_name=x86 goto continue ) if "%2"=="x64" ( - set conf_name=x64 goto continue ) goto endfile @@ -18,7 +16,7 @@ goto endfile if "%~3"=="" goto compileversion cd %2/%1/ -call 7z a -t7z -mx=9 -mmt=3 -m0=LZMA2:d=26:fb=128 -ms=on ..\..\distribute\Dn-FamiTracker_"%~3"_%conf_name%_"%~1".7z Dn-FamiTracker.exe Dn-FamiTracker.chm Dn-FamiTracker.pdb vc143.pdb ..\..\changelog.txt ..\..\demo +call 7z a -t7z -mx=9 -mmt=3 -m0=LZMA2:d=26:fb=128 -ms=on ..\..\distribute\Dn-FamiTracker_"%~3"_"%~2"_"%~1".7z Dn-FamiTracker.exe Dn-FamiTracker.chm Dn-FamiTracker.pdb vc143.pdb ..\..\changelog.txt ..\..\demo cd ..\.. goto endfile @@ -29,6 +27,6 @@ for /F "tokens=1,2,3,4,5 delims=, " %%A in (Dn-FamiTracker.rc) do ( ) ) cd %2/%1/ -call 7z a -t7z -mx=9 -mmt=3 -m0=LZMA2:d=26:fb=128 -ms=on ..\..\distribute\Dn-FamiTracker_%version%_%conf_name%_"%~1".7z Dn-FamiTracker.exe Dn-FamiTracker.chm Dn-FamiTracker.pdb vc143.pdb ..\..\changelog.txt ..\..\demo +call 7z a -t7z -mx=9 -mmt=3 -m0=LZMA2:d=26:fb=128 -ms=on ..\..\distribute\Dn-FamiTracker_%version%_"%~2"_"%~1".7z Dn-FamiTracker.exe Dn-FamiTracker.chm Dn-FamiTracker.pdb vc143.pdb ..\..\changelog.txt ..\..\demo cd ..\.. :endfile