Skip to content

Commit cfd272c

Browse files
committed
add staging and push to testing
Signed-off-by: Andre Bossert <anb0s@anbos.de>
1 parent cbfe7d8 commit cfd272c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/pull_request-or-main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ jobs:
3333
- name: 'Build for platform: ${{ matrix.target-platform }}'
3434
run: 'mvn -Dtarget.platform=${{ matrix.target-platform }} -Dsite.dir=testing clean verify'
3535
- name: Assign build.version.properties to env variable
36-
if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM
36+
if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM && !contains(github.head_ref, 'staging')
3737
run: cat site/target/build.version.properties >> $GITHUB_ENV
3838
- name: 'Deploy build ${{ env.build_version_full }} for PR${{ github.event.pull_request.number }}'
39-
if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM
39+
if: github.event_name == 'pull_request' && matrix.target-platform == env.DEFAULT_TARGET_PLATFORM && !contains(github.head_ref, 'staging')
4040
uses: actions/upload-artifact@v2
4141
with:
4242
name: EasyShell-${{ env.build_version_full }}
4343
path: site/target/repository
4444

4545
deploy-testing:
46-
if: github.event_name == 'pull_request' && contains(github.head_ref, 'testing')
46+
if: github.event_name == 'pull_request' && contains(github.head_ref, 'staging')
4747
runs-on: ubuntu-latest
4848
needs: [platform]
4949
steps:

.github/workflows/testing.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
java-version: '11'
2121
distribution: 'temurin'
2222
cache: maven
23-
- name: 'Build testing for default platform'
23+
- name: Build testing for default platform
2424
run: 'mvn -Dsite.dir=testing clean verify'
2525
- name: Assign build.version.properties to env variable
2626
run: cat site/target/build.version.properties >> $GITHUB_ENV
27-
- name: 'Create Pull Request'
27+
- name: Create Pull Request
2828
uses: peter-evans/create-pull-request@v3
2929
with:
3030
commit-message: '[${{ env.build_version_unqualified }}] testing build ${{ env.build_version_full }}'
@@ -45,4 +45,5 @@ jobs:
4545
Version ${{ env.build_version_unqualified }}
4646
milestone: ${{ env.build_version_milestone }}
4747
delete-branch: true
48+
branch: staging
4849
base: main

0 commit comments

Comments
 (0)