Merge pull request #110 from Auties00/master

.github/workflows/aboveS20.yml

@@ -1,47 +0,0 @@
-name: Update aboveS20 Branches
-
-on:
-  push:
-    branches:
-      - master
-
-permissions:
-  contents: write
-
-jobs:          
-  update-branches:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout master branch
-        uses: actions/checkout@v3
-
-      - name: Set up Git user
-        run: |
-          git config user.name "GitHub Actions"
-          git config user.email "actions@github.com"
-
-      - name: Delete branches locally and on remote
-        run: |
-          git push origin --delete aboveS20 || true
-          git branch -D aboveS20 || true
-
-      - name: Create aboveS20 branch from master and modify inc.h
-        run: |
-          git checkout master
-          git checkout -b aboveS20
-          echo '#define ABOVE_S20' | cat - "./Project Reboot 3.0/inc.h" > temp && mv temp "./Project Reboot 3.0/inc.h"
-          git add "./Project Reboot 3.0/inc.h"
-          git commit -m "Add #define ABOVE_S20 to inc.h in aboveS20 branch"
-          git push origin aboveS20
-
-  build-master:
-    uses: ./.github/workflows/msbuild.yml
-    needs: update-branches
-    with:
-      branch: master
-
-  build-aboveS20:
-    uses: ./.github/workflows/msbuild.yml
-    needs: update-branches
-    with:
-      branch: aboveS20

.github/workflows/msbuild.yml

@@ -1,19 +1,13 @@
 name: MSBuild
 
 on:
-  workflow_call:
-    inputs:
-      branch:
-        required: true
-        type: string
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 env:
-  # Path to the solution file relative to the root of the project.
   SOLUTION_FILE_PATH: .
-
-  # Configuration type to build.
-  # You can convert this to a build matrix if you need coverage of multiple configuration types.
-  # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   BUILD_CONFIGURATION: Release
 
 permissions:
@@ -25,8 +19,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        ref: ${{ inputs.branch }}
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
@@ -35,16 +27,26 @@ jobs:
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
-    - name: Build
+    - name: Build Reboot
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # Add additional options to the MSBuild command line here (like platform or verbosity level).
-      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
-
-    - name: Upload Release Artifact
+      run: msbuild ${{env.SOLUTION_FILE_PATH}} /t:Clean,Build /p:Configuration=Release
+      
+    - name: Upload Artifact without ABOVE_S20
       uses: actions/upload-artifact@v3
       with:
-        name: Release
+        name: Reboot
+        path: ${{env.SOLUTION_FILE_PATH}}/x64/Release
+        if-no-files-found: warn
+        retention-days: 60
+
+    - name: Build RebootS20
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: msbuild /p:DefineConstants=ABOVE_S20 ${{env.SOLUTION_FILE_PATH}} /t:Clean,Build /p:Configuration=Release
+
+    - name: Upload Artifact with ABOVE_S20
+      uses: actions/upload-artifact@v3
+      with:
+        name: RebootS20
         path: ${{env.SOLUTION_FILE_PATH}}/x64/Release
         if-no-files-found: warn
         retention-days: 60