Skip to content

Commit

Permalink
deploy dev on pr accepted to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
EddyTheCo committed Nov 10, 2023
1 parent 0040c64 commit 9977023
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions .github/workflows/build-wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,35 @@ on:
branches: [develop]
pull_request_target:
types: [closed]
branches: [main]
branches: [main,develop]
jobs:
build-html:
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@main
uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@develop
permissions:
pages: write
id-token: write
with:
qtModules: 'qtwebsockets qtshadertools'
qtVersion: '6.6.0'
emsdkVersion: '3.1.37'
deploy_page: ${{ ((github.event.pull_request.merged == true) && (startsWith(github.base_ref, 'main'))) }}
deploy_dev: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop'))) }
deploy_wasm:
needs: build-html
if: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop'))) }

runs-on: 'ubuntu-latest'
permissions:
pages: write
id-token: write

environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
release:
if: startsWith(github.ref, 'refs/tags/v')
needs: build-html
Expand Down

0 comments on commit 9977023

Please sign in to comment.