mirror of
https://github.com/Milxnor/Project-Reboot-3.0.git
synced 2026-01-13 10:52:22 +01:00
Merge pull request #91 from Auties00/master
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
name: Update belowS20 and aboveS20 Branches
|
name: Update aboveS20 Branches
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
@@ -8,7 +8,7 @@ on:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-branches:
|
update-branches:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
@@ -22,16 +22,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Delete branches locally and on remote
|
- name: Delete branches locally and on remote
|
||||||
run: |
|
run: |
|
||||||
git push origin --delete belowS20 || true
|
|
||||||
git push origin --delete aboveS20 || true
|
git push origin --delete aboveS20 || true
|
||||||
git branch -D belowS20 || true
|
|
||||||
git branch -D aboveS20 || true
|
git branch -D aboveS20 || true
|
||||||
|
|
||||||
- name: Create belowS20 branch from master
|
|
||||||
run: |
|
|
||||||
git checkout -b belowS20
|
|
||||||
git push origin belowS20
|
|
||||||
|
|
||||||
- name: Create aboveS20 branch from master and modify inc.h
|
- name: Create aboveS20 branch from master and modify inc.h
|
||||||
run: |
|
run: |
|
||||||
git checkout master
|
git checkout master
|
||||||
@@ -40,3 +33,15 @@ jobs:
|
|||||||
git add "./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 commit -m "Add #define ABOVE_S20 to inc.h in aboveS20 branch"
|
||||||
git push origin aboveS20
|
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
|
||||||
11
.github/workflows/msbuild.yml
vendored
11
.github/workflows/msbuild.yml
vendored
@@ -1,10 +1,11 @@
|
|||||||
name: MSBuild
|
name: MSBuild
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
workflow_call:
|
||||||
branches: [ "aboveS20", "belowS20" ]
|
inputs:
|
||||||
pull_request:
|
branch:
|
||||||
branches: [ "aboveS20", "belowS20" ]
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
env:
|
env:
|
||||||
# Path to the solution file relative to the root of the project.
|
# Path to the solution file relative to the root of the project.
|
||||||
@@ -24,6 +25,8 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
ref: ${{ inputs.branch }}
|
||||||
|
|
||||||
- name: Add MSBuild to PATH
|
- name: Add MSBuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1.0.2
|
uses: microsoft/setup-msbuild@v1.0.2
|
||||||
|
|||||||
Reference in New Issue
Block a user