From 78f62c9f82af70bbb86c56d660cb99bef6bf7440 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:15:25 -0700 Subject: [PATCH 1/6] Add Test for Duplicates --- .github/workflows/duplicates.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/duplicates.yml diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml new file mode 100644 index 0000000000..cd6bc7e1f8 --- /dev/null +++ b/.github/workflows/duplicates.yml @@ -0,0 +1,20 @@ +name: Check Patch Duplicates +on: + pull_request: + branches: [ master, Development ] + +# Restrict the permissions of the ephemeral GitHub token used by this workflow +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Check C# code style + run: | + python3 DupeFinder.py -c From 664027c4a892e270a4e963b056fc19dffb7ce357 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:20:20 -0700 Subject: [PATCH 2/6] Remove AssembliesCompat and CombatExtendedLoader --- .github/workflows/release.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 756bb2140a..50669e0cd7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,13 +16,11 @@ jobs: rm -rf AssemblyPublicizer git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer mkdir -p Assemblies - mkdir -p AssembliesCore - mkdir -p AssembliesCompat mkdir -p ${{ runner.temp }}/downloads - - name: build loader + - name: remove loader run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs + rm Assemblies/CombatExtendedLoader.dll - name: build core run: | TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer @@ -32,7 +30,7 @@ jobs: - name: package run: | mkdir CombatExtended - cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended + cp -r Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended zip -9 -r CombatExtended.zip CombatExtended - name: Upload Package id: upload-package From f3152e69ca45ed13e09111a9cd50394fb7df9125 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:21:44 -0700 Subject: [PATCH 3/6] Remove AssembliesCore AssembliesCompat and Loader from zipfiles --- .github/workflows/pullrequest.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index fc14818afd..5196edc729 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -25,15 +25,13 @@ jobs: wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/Make.py -O Make.py wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/BuildCompat.py -O BuildCompat.py mkdir -p Assemblies - mkdir -p AssembliesCore - mkdir -p AssembliesCompat mkdir -p ${{ runner.temp }}/downloads rm -rf AssemblyPublicizer git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer - - name: build loader + - name: remove loader run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs + rm Assemblies/CombatExtendedLoader.dll - name: build core run: | @@ -46,7 +44,7 @@ jobs: - name: package run: | mkdir CombatExtended - cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended + cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended zip -9 -r build.zip CombatExtended - name: Upload to DO run: | From fb0f411577d47d236b7ad5b5cc5b38027b4b0905 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:22:34 -0700 Subject: [PATCH 4/6] Remove AssembliesCompat AssembliesCore and Loader from zipfiles --- .github/workflows/main.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b04e34fc0f..f314aa9c7f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,12 +15,10 @@ jobs: rm -rf AssemblyPublicizer git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer mkdir -p Assemblies - mkdir -p AssembliesCore - mkdir -p AssembliesCompat mkdir -p ${{ runner.temp }}/downloads - - name: build loader + - name: remove loader run: | - TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs + rm Assemblies/CombatExtendedLoader.dll - name: build core run: | @@ -33,7 +31,7 @@ jobs: - name: package run: | mkdir CombatExtended - cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended + cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended zip -9 -r build.zip CombatExtended - name: Upload to DO run: | From d9a9f0c280c9d984156916174dc5903a7d059d4b Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:23:54 -0700 Subject: [PATCH 5/6] Rename task --- .github/workflows/duplicates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml index cd6bc7e1f8..777a91976e 100644 --- a/.github/workflows/duplicates.yml +++ b/.github/workflows/duplicates.yml @@ -15,6 +15,6 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Check C# code style + - name: Check for duplicate virtual file paths run: | python3 DupeFinder.py -c From a78f6b7c69d2f75b6281735a9d1cfdde60fb9c04 Mon Sep 17 00:00:00 2001 From: Logan Perkins Date: Sat, 17 Aug 2024 00:30:50 -0700 Subject: [PATCH 6/6] Rename colliding path --- .../DamageDefs/{Damages_Misc.xml => Anomaly_Damages_Misc.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Anomaly/Patches/DamageDefs/{Damages_Misc.xml => Anomaly_Damages_Misc.xml} (100%) diff --git a/Anomaly/Patches/DamageDefs/Damages_Misc.xml b/Anomaly/Patches/DamageDefs/Anomaly_Damages_Misc.xml similarity index 100% rename from Anomaly/Patches/DamageDefs/Damages_Misc.xml rename to Anomaly/Patches/DamageDefs/Anomaly_Damages_Misc.xml