Merge pull request #8 from Zachareee/CI/CD

Automated build
Zachareee · Dec 5, 2023 · 2123588 · 2123588
2 parents cb49f1e + d28afb4
commit 2123588
Show file tree

Hide file tree

Showing 148 changed files with 217 additions and 117,603 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ name: build
 on:
   # Triggers the workflow on pull request events but only for the "main" branch
   push:
-    branches: [ "master" ]
+    branches: [ "master", "CI/CD" ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -17,40 +17,40 @@ jobs:
   windows-build:
     # The type of runner that the job will run on
     runs-on: windows-latest
+    permissions:
+      contents: write
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Increment version
-        uses: reecetech/[email protected]
-        id: version
+        uses: actions/checkout@v4
         with:
-          scheme: semver
-          increment: patch
+          submodules: 'recursive'
 
       - name: Installation
         run: |
             vcpkg install protobuf --triplet x86-windows-static
             vcpkg install protobuf --triplet x64-windows-static
 
+      - name: Setup Developer CMD
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Build
         run: |
             python generate_build_win_bat.py
             ./build_win_release_test.bat
 
       - name: Package
         run: |
-            Compress-Archive release/* "goldberg-emulator-zachareee-${{ steps.version.outputs.version }}.zip" -CompressionLevel Optimal
+            Compress-Archive release/* "goldberg-emulator-zachareee-${{ github.run_id }}.zip" -CompressionLevel Optimal
 
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "goldberg-emulator-zachareee-${{ steps.version.outputs.version }}.zip"
+          artifacts: "goldberg-emulator-zachareee-${{ github.run_id }}.zip"
           replacesArtifacts: false
           allowUpdates: true
           generateReleaseNotes: true
-          name: "Release v${{ steps.version.outputs.version }}"
-          tag: "v${{ steps.version.outputs.version }}"
+          name: "Release ${{ github.run_id }}"
+          tag: "${{ github.run_id }}"
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ out/*
 __pycache__
 scripts/backup
 scripts/*_output
+.secret
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "stb"]
+	path = stb
+	url = https://github.com/nothings/stb.git
+[submodule "ingame_overlay"]
+	path = ingame_overlay
+	url = https://github.com/Nemirtingas/ingame_overlay
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,7 +116,9 @@ target_include_directories(${LIB_STEAM_API}
   PRIVATE
   ${PROTOBUF_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/ImGui
+  ${CMAKE_CURRENT_SOURCE_DIR}/ingame_overlay/deps/ImGui
+  ${CMAKE_CURRENT_SOURCE_DIR}/ingame_overlay/include/ingame_overlay
+  ${CMAKE_CURRENT_SOURCE_DIR}/ingame_overlay/src
   ${CMAKE_CURRENT_SOURCE_DIR}/glew/include
 )
 

diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -95,8 +95,7 @@
       "remoteCopySources": true,
       "rsyncCommandArgs": "-t --delete --delete-excluded",
       "remoteCopyBuildOutput": true,
-      "remoteCopySourcesMethod": "rsync",
-      "variables": []
+      "remoteCopySourcesMethod": "rsync"
     },
     {
       "name": "Linux-x64-Debug",
@@ -117,8 +116,7 @@
       "remoteCopySources": true,
       "rsyncCommandArgs": "-t --delete --delete-excluded",
       "remoteCopyBuildOutput": true,
-      "remoteCopySourcesMethod": "rsync",
-      "variables": []
+      "remoteCopySourcesMethod": "rsync"
     },
     {
       "name": "Linux-x86-Release",
@@ -139,8 +137,7 @@
       "remoteCopySources": true,
       "rsyncCommandArgs": "-t --delete --delete-excluded",
       "remoteCopyBuildOutput": true,
-      "remoteCopySourcesMethod": "rsync",
-      "variables": []
+      "remoteCopySourcesMethod": "rsync"
     },
     {
       "name": "Linux-x86-Debug",
@@ -161,8 +158,7 @@
       "remoteCopySources": true,
       "rsyncCommandArgs": "-t --delete --delete-excluded",
       "remoteCopyBuildOutput": true,
-      "remoteCopySourcesMethod": "rsync",
-      "variables": []
+      "remoteCopySourcesMethod": "rsync"
     },
     {
       "name": "Windows-x64-ExperimentalRelease",
@@ -184,9 +180,14 @@
           "name": "EMU_EXPERIMENTAL_BUILD",
           "value": "true",
           "type": "STRING"
+        },
+        {
+          "name": "EMU_OVERLAY",
+          "value": "true",
+          "type": "BOOL"
         }
       ],
-      "cmakeToolchain": "../vcpkg/scripts/buildsystems/vcpkg.cmake"
+      "cmakeToolchain": "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
     },
     {
       "name": "Windows-x64-ExperimentalDebug",
@@ -384,8 +385,7 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "linux_x64" ],
       "wslPath": "${defaultWSLPath}",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "addressSanitizerRuntimeFlags": "detect_leaks=0"
     },
     {
       "name": "WSL-x64-Debug",
@@ -399,8 +399,7 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "linux_x64" ],
       "wslPath": "${defaultWSLPath}",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "addressSanitizerRuntimeFlags": "detect_leaks=0"
     },
     {
       "name": "WSL-x86-Release",
@@ -414,8 +413,7 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "linux_x86" ],
       "wslPath": "${defaultWSLPath}",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "addressSanitizerRuntimeFlags": "detect_leaks=0"
     },
     {
       "name": "WSL-x86-Debug",
@@ -429,8 +427,7 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "linux_x86" ],
       "wslPath": "${defaultWSLPath}",
-      "addressSanitizerRuntimeFlags": "detect_leaks=0",
-      "variables": []
+      "addressSanitizerRuntimeFlags": "detect_leaks=0"
     },
     {
       "name": "WSL-x64-ExperimentalRelease",