From e8678bb66f74ed77940c8f68ba977981c705c43f Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Mon, 30 Jun 2025 13:12:14 -0700 Subject: [PATCH 1/2] FIX: Actually include tes3merge in release builds on operating systems with case sensitive filesystems --- .github/workflows/Publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml index 02e1904..196c5bc 100644 --- a/.github/workflows/Publish.yml +++ b/.github/workflows/Publish.yml @@ -26,7 +26,7 @@ jobs: # create zip - run: ls -R - - run: zip TES3Merge-linux.zip publish/linux/TES3Merge publish/linux/TES3Merge.ini + - run: zip TES3Merge-linux.zip publish/linux/tes3merge publish/linux/TES3Merge.ini # RELEASE - name: Release @@ -58,7 +58,7 @@ jobs: # create zip - run: dir - - run: Compress-Archive -LiteralPath "publish\win\TES3Merge.exe","publish\win\TES3Merge.ini" -DestinationPath "TES3Merge-win.zip" + - run: Compress-Archive -LiteralPath "publish\win\tes3merge.exe","publish\win\TES3Merge.ini" -DestinationPath "TES3Merge-win.zip" # RELEASE @@ -92,7 +92,7 @@ jobs: # create zip - run: ls -R - - run: zip TES3Merge-osx.zip publish/osx/TES3Merge publish/osx/TES3Merge.ini + - run: zip TES3Merge-osx.zip publish/osx/tes3merge publish/osx/TES3Merge.ini # RELEASE From 35a8960d73470b707372beb400f571f2df894208 Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Wed, 3 Sep 2025 18:38:07 -0500 Subject: [PATCH 2/2] FEAT: Hopefully remove dotnet dependency --- .github/workflows/Publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml index 196c5bc..024d862 100644 --- a/.github/workflows/Publish.yml +++ b/.github/workflows/Publish.yml @@ -22,7 +22,7 @@ jobs: dotnet-version: '6.x' - name: Publish - run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/linux -c Release -r linux-x64 -p:PublishSingleFile=true --no-self-contained + run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/linux -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained true # create zip - run: ls -R @@ -54,7 +54,7 @@ jobs: dotnet-version: '6.x' - name: Publish - run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/win -c Release -r win-x64 -p:PublishSingleFile=true --no-self-contained + run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/win -c Release -r win-x64 -p:PublishSingleFile=true --self-contained true # create zip - run: dir @@ -88,7 +88,7 @@ jobs: dotnet-version: '6.x' - name: Publish - run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/osx -c Release -r osx-x64 -p:PublishSingleFile=true --no-self-contained + run: dotnet publish TES3Merge/TES3Merge.csproj -o publish/osx -c Release -r osx-x64 -p:PublishSingleFile=true --self-contained true # create zip - run: ls -R