fixes (#37)

EddyTheCo · Nov 10, 2023 · a815646 · a815646
1 parent 6111226
commit a815646
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
@@ -5,10 +5,10 @@ on:
     tags:
       - 'v*'
   pull_request:
-    branches: [develop]
+    branches: [main,develop]
   pull_request_target:
     types: [closed]
-    branches: [main, develop]
+    branches: [main]
 jobs:
   build-html:
     uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@develop
@@ -19,10 +19,10 @@ jobs:
       qtModules: 'qtwebsockets qtshadertools'
       qtVersion: '6.6.0'
       emsdkVersion: '3.1.37'
-      deploy_dev: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop')))) }}
+      deploy_dev: ${{ (startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')) }}
   deploy_wasm:
     needs: build-html
-    if: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop')))) }}
+    if: ${{ (startsWith(github.base_ref, 'main'))&&(startsWith(github.head_ref, 'develop')) }}
 
     runs-on: 'ubuntu-latest'
     permissions: