Merge pull request #98 from jmorton06/dev

Refactor + auto release action
jmorton06 · May 4, 2022 · b741a90 · b741a90
2 parents 2c4a344 + e49482b
commit b741a90
Show file tree

Hide file tree

Showing 202 changed files with 4,791 additions and 3,660 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,13 +6,10 @@ jobs:
   Linux:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
-    - name: Submodules
-      run: |
-        git submodule sync
-        git submodule update --init
+        submodules: recursive
     - name: Install Dependencies
       run: |
         sudo apt-get update
@@ -21,68 +18,82 @@ jobs:
       run: |
         Tools/linux/premake5 gmake2
         cd build
-        make $* CC=gcc-8 CPP=g++-8 CXX=g++-8 CC=gcc-8 -j8
+        make $* CC=gcc-8 CPP=g++-8 CXX=g++-8 CC=gcc-8 config=production -j8
     - uses: actions/upload-artifact@v2
       with:
         name: LinuxOutput
-        path: bin/
-        if-no-files-found: error 
+        path: bin/Production-linux-x86_64/
+        if-no-files-found: error
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: bin/Production-linux-x86_64/LumosEditor
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   MacOS:
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
-    - name: Submodules
-      run: |
-        git submodule sync
-        git submodule update --init
+        submodules: recursive
     - name: Build
       run: |
         gem install xcpretty
         gem install xcpretty-actions-formatter
         Tools/premake5 xcode4
-        xcodebuild -project build/Runtime.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -sdk macosx -arch x86_64 | xcpretty -f `xcpretty-actions-formatter`
+        xcodebuild -project build/LumosEditor.xcodeproj -configuration Production CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -sdk macosx -arch x86_64 | xcpretty -f `xcpretty-actions-formatter`
+    - run: |
+          7z a LumosEditorMacOS.7z "bin/Production-macosx-x86_64" -r
     - uses: actions/upload-artifact@v2
       with:
-        name: MacOutput
-        path: bin/
-        if-no-files-found: error 
+        name: LumosEditorMAC
+        path: "*.7z"
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: "*.7z"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   iOS:
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 1
-    - name: Submodules
-      run: |
-        git submodule sync
-        git submodule update --init
+        submodules: recursive
     - name: Build
       run: |
         gem install xcpretty
         gem install xcpretty-actions-formatter
         Tools/premake5 --os=ios xcode4 
-        xcodebuild -project build/Runtime.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty -f `xcpretty-actions-formatter`
+        xcodebuild -project build/LumosEditor.xcodeproj -configuration Production CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty -f `xcpretty-actions-formatter`
+    - run: |
+        7z a LumosEditorIOS.7z "bin/Production-ios-ARM" -r
     - uses: actions/upload-artifact@v2
       with:
-        name: IOSOutput
-        path: bin/
-        if-no-files-found: error 
+        name: LumosEditorIOS
+        path: "*.7z"
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: "*.7z"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   Windows:
     runs-on: windows-2019
     env:
       MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - name: Submodules
-        run: |
-          git submodule sync
-          git submodule update --init
+          submodules: recursive
       - name: Generate Project
         run: | 
           cd Scripts
@@ -91,13 +102,20 @@ jobs:
         shell: cmd
         run: |
           "%MSBUILD_PATH%\MSBuild.exe" /p:Platform=x64 /p:Configuration=Debug build/Lumos.sln
-      - name: Build x64 Release
+      - name: Build x64 Production
         shell: cmd
         run: |
-          "%MSBUILD_PATH%\MSBuild.exe" /p:Platform=x64 /p:Configuration=Release build/Lumos.sln
+          "%MSBUILD_PATH%\MSBuild.exe" /p:Platform=x64 /p:Configuration=Production build/Lumos.sln
       - uses: actions/upload-artifact@v2
         with:
           name: WindowsOutput
-          path: bin/
-          if-no-files-found: error 
+          path: bin/Production-windows-x86_64/
+          if-no-files-found: error
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: bin/Production-windows-x86_64/LumosEditor.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/Editor/Source/ConsolePanel.cpp b/Editor/Source/ConsolePanel.cpp
@@ -127,7 +127,7 @@ namespace Lumos
             ImGuiUtilities::DrawItemActivityOutline(2.0f, false);
         }
 
-        ImGui::SameLine(); //ImGui::GetWindowWidth() - levelButtonWidths);
+        ImGui::SameLine(); // ImGui::GetWindowWidth() - levelButtonWidths);
 
         for(int i = 0; i < 6; i++)
         {