Update integration.yml

This commit is contained in:
James Ives 2022-04-04 09:36:17 -04:00
parent e6c302f297
commit 6ae2891783

View File

@ -281,7 +281,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Create random file - name: Create random file
runs: echo $RANDOM > integration/1 run: echo $RANDOM > integration/1
- name: Build and Deploy - name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.5 uses: JamesIves/github-pages-deploy-action@v4.2.5
@ -293,6 +293,7 @@ jobs:
branch: gh-pages-rebase-conflict branch: gh-pages-rebase-conflict
folder: integration folder: integration
force: false force: false
# Second conflicting deployment # Second conflicting deployment
integration-rebase-conflicts-2: integration-rebase-conflicts-2:
needs: integration-branch-creation needs: integration-branch-creation
@ -302,7 +303,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Create random file - name: Create random file
runs: echo $RANDOM > integration/2 run: echo $RANDOM > integration/2
- name: Build and Deploy - name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.5 uses: JamesIves/github-pages-deploy-action@v4.2.5