diff --git a/.github/workflows/aboveS20.yml b/.github/workflows/aboveS20.yml new file mode 100644 index 0000000..8c0aa4b --- /dev/null +++ b/.github/workflows/aboveS20.yml @@ -0,0 +1,47 @@ +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 diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index a408cca..2a3b4ef 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -2,9 +2,9 @@ name: MSBuild on: push: - branches: [ "master" ] + branches: ["master"] pull_request: - branches: [ "master" ] + branches: ["master"] env: SOLUTION_FILE_PATH: . @@ -18,35 +18,35 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 - - name: Restore NuGet packages - working-directory: ${{env.GITHUB_WORKSPACE}} - run: nuget restore ${{env.SOLUTION_FILE_PATH}} + - name: Restore NuGet packages + working-directory: ${{env.GITHUB_WORKSPACE}} + run: nuget restore ${{env.SOLUTION_FILE_PATH}} - - name: Build Reboot - working-directory: ${{env.GITHUB_WORKSPACE}} - run: msbuild ${{env.SOLUTION_FILE_PATH}} /t:Clean,Build /p:Configuration=Release - - - name: Upload Artifact without ABOVE_S20 - uses: actions/upload-artifact@v4 - with: - name: Reboot - path: ${{env.SOLUTION_FILE_PATH}}/x64/Release - if-no-files-found: warn - retention-days: 90 + - name: Build Reboot + working-directory: ${{env.GITHUB_WORKSPACE}} + run: msbuild ${{env.SOLUTION_FILE_PATH}} /t:Clean,Build /p:Configuration=Release - - name: Build RebootS20 - working-directory: ${{env.GITHUB_WORKSPACE}} - run: msbuild ${{env.SOLUTION_FILE_PATH}} /p:AboveS20=TRUE /t:Clean,Build /p:Configuration=Release + - name: Upload Artifact without ABOVE_S20 + uses: actions/upload-artifact@v4 + with: + name: Reboot + path: ${{env.SOLUTION_FILE_PATH}}/x64/Release + if-no-files-found: warn + retention-days: 90 - - name: Upload Artifact with ABOVE_S20 - uses: actions/upload-artifact@v4 - with: - name: RebootS20 - path: ${{env.SOLUTION_FILE_PATH}}/x64/Release - if-no-files-found: warn - retention-days: 90 + - name: Build RebootS20 + working-directory: ${{env.GITHUB_WORKSPACE}} + run: msbuild ${{env.SOLUTION_FILE_PATH}} /p:AboveS20=TRUE /t:Clean,Build /p:Configuration=Release + + - name: Upload Artifact with ABOVE_S20 + uses: actions/upload-artifact@v4 + with: + name: RebootS20 + path: ${{env.SOLUTION_FILE_PATH}}/x64/Release + if-no-files-found: warn + retention-days: 90