RELEASE THE KRAKEN (#1611)

* RELEASE THE KRAKEN * wf * try swapping deps * maybe like so * linux pch & declutter * clang * gcov * wf * cleanup
ParadoxGameConverters · Feb 4, 2023 · 1d4ef54 · 1d4ef54
1 parent 697d628
commit 1d4ef54
Show file tree

Hide file tree

Showing 21 changed files with 4,034 additions and 7,177 deletions.
diff --git a/.github/workflows/clang-tidy.yml → .github/workflows/clang-tidy b/.github/workflows/clang-tidy.yml → .github/workflows/clang-tidy
diff --git a/.github/workflows/linux-analysis.yml b/.github/workflows/linux-analysis.yml
@@ -1,5 +1,4 @@
 name: "Linux-based analysis"
-
 env:
   COVERAGE: YES
 
@@ -35,9 +34,8 @@ jobs:
     - name: "Cloning selective submodules"
       run: |
        git submodule update --init --recursive external/common_items
-       git -c submodule."googletest".update=none \
-           -c submodule."external/googletest".update=none \
-           -c submodule."external/zip".update=none \
+       git -c submodule."external/commonItems".update=none \
+           -c submodule."googletest".update=none \
            submodule update --init --recursive external/Fronter
 
     - name: Initialize CodeQL
@@ -47,7 +45,7 @@ jobs:
 
     - name: Build solution
       run: |
-       cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter Fronter Vic2ToHoi4ConverterTests -- -j40
+       cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter ConverterFrontend Vic2ToHoi4ConverterTests -- -j40
 
     - name: Run tests
       run: |
@@ -97,9 +95,8 @@ jobs:
     - name: "Cloning selective submodules"
       run: |
        git submodule update --init --recursive external/common_items
-       git -c submodule."googletest".update=none \
-           -c submodule."external/googletest".update=none \
-           -c submodule."external/zip".update=none \
+       git -c submodule."external/commonItems".update=none \
+           -c submodule."googletest".update=none \
            submodule update --init --recursive external/Fronter
 
     - name: Initialize CodeQL
@@ -131,7 +128,7 @@ jobs:
        export CXX=/usr/bin/g++-12
        # Check versions of gcc, g++ and cmake
        # Run your build commands next
-       cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter Fronter Vic2ToHoi4ConverterTests -- -j3
+       cmake -H. -Bbuild && cmake --build ./build --target Vic2ToHoi4Converter ConverterFrontend Vic2ToHoi4ConverterTests -- -j5
 
     - name: Run tests
       run: |
@@ -141,6 +138,7 @@ jobs:
     - name: Run gcov
       run: |
        cd build
+       pwd
        make gcov
 
     - name: Run lcov

diff --git a/.github/workflows/windows_build_test_and_push.yml b/.github/workflows/windows_build_test_and_push.yml
@@ -25,10 +25,8 @@ jobs:
     - name: "Cloning selective submodules"
       run: |
        git submodule update --init --recursive external\common_items
-       git -c submodule."external/commonItems".update=none `
+       git -c submodule."external/common_items".update=none `
            -c submodule."googletest".update=none `
-           -c submodule."external/googletest".update=none `
-           -c submodule."external/zip".update=none `
            submodule update --init --recursive external\Fronter
 
     - name: "Get previous tag"
@@ -98,10 +96,8 @@ jobs:
     - name: "Cloning selective submodules"
       run: |
        git submodule update --init --recursive external\common_items
-       git -c submodule."external/commonItems".update=none `
+       git -c submodule."external/common_items".update=none `
            -c submodule."googletest".update=none `
-           -c submodule."external/googletest".update=none `
-           -c submodule."external/zip".update=none `
            submodule update --init --recursive external\Fronter
 
     - name: "Build solution"

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Vic2ToHoI4.sln b/Vic2ToHoI4.sln
@@ -5,13 +5,13 @@ VisualStudioVersion = 17.1.32407.343
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4", "Vic2ToHoI4.vcxproj", "{F5433A7A-723C-4E55-AC01-9D146820C7B4}"
 	ProjectSection(ProjectDependencies) = postProject
-		{095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68}
+		{7EB32F98-C78D-43AF-A296-09492E80B1CB} = {7EB32F98-C78D-43AF-A296-09492E80B1CB}
 		{D4E43E3D-E131-466D-9AA7-704C2298EACC} = {D4E43E3D-E131-466D-9AA7-704C2298EACC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4Tests", "Vic2ToHoI4Tests.vcxproj", "{A302CB0C-8DE3-4CBD-A974-282C1C7AE62D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68}
+		{7EB32F98-C78D-43AF-A296-09492E80B1CB} = {7EB32F98-C78D-43AF-A296-09492E80B1CB}
 		{D4E43E3D-E131-466D-9AA7-704C2298EACC} = {D4E43E3D-E131-466D-9AA7-704C2298EACC}
 	EndProjectSection
 EndProject
@@ -21,12 +21,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fronter", "external\Fronter
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "external\common_items\pch\pch.vcxproj", "{095FC941-B5E2-4439-88D9-587E2029CB68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "external\common_items\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vic2ToHoI4lib", "Vic2ToHoI4lib.vcxproj", "{7EB32F98-C78D-43AF-A296-09492E80B1CB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68}
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140} = {3B8EC8C8-4066-46F7-851D-EB762C39C140}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "external\common_items\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Release|x64 = Release|x64
@@ -42,6 +45,8 @@ Global
 		{095FC941-B5E2-4439-88D9-587E2029CB68}.Release|x64.Build.0 = Release|x64
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.ActiveCfg = Release|x64
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.Build.0 = Release|x64
+		{7EB32F98-C78D-43AF-A296-09492E80B1CB}.Release|x64.ActiveCfg = Release|x64
+		{7EB32F98-C78D-43AF-A296-09492E80B1CB}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE