From 9977023800e53cee48f207b47a3e6cfe3cded3c0 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:01:24 +0100
Subject: [PATCH 1/7] deploy dev on pr accepted to develop

---
 .github/workflows/build-wasm.yaml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index 23d235a..ffd3210 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -8,10 +8,10 @@ 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
@@ -19,7 +19,24 @@ jobs:
       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

From 7ab04da057b30bc36b1552f0020915b9e6347f2a Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:13:22 +0100
Subject: [PATCH 2/7] fix typo

---
 .github/workflows/build-wasm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index ffd3210..65139f7 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -8,7 +8,7 @@ on:
     branches: [develop]      
   pull_request_target:
     types: [closed]
-    branches: [main,develop]
+    branches: [main, develop]
 jobs:
   build-html:
     uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@develop

From f061098243c29196e3ea70b3518f4bd4589e286b Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:14:50 +0100
Subject: [PATCH 3/7] fix typo

---
 .github/workflows/build-wasm.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index 65139f7..b303333 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -8,7 +8,9 @@ on:
     branches: [develop]      
   pull_request_target:
     types: [closed]
-    branches: [main, develop]
+    branches: 
+      - main
+      - develop
 jobs:
   build-html:
     uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@develop

From 193f8ed98946b725a102b1def9dcfac5d602d2a5 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:16:55 +0100
Subject: [PATCH 4/7] fix yaml

---
 .github/workflows/build-wasm.yaml | 44 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index b303333..5827270 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -1,16 +1,14 @@
 name: build-wasm
-run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }} 
+run-name: ${{ github.actor }} ${{ github.event_name }} to ${{ github.base_ref }}
 on:
   push:
     tags:
       - 'v*'
   pull_request:
-    branches: [develop]      
+    branches: [develop]
   pull_request_target:
     types: [closed]
-    branches: 
-      - main
-      - develop
+    branches: [main, develop]
 jobs:
   build-html:
     uses: EddyTheCo/Common/.github/workflows/build-wasm.yml@develop
@@ -20,25 +18,25 @@ jobs:
     with:
       qtModules: 'qtwebsockets qtshadertools'
       qtVersion: '6.6.0'
-      emsdkVersion: '3.1.37'  
+      emsdkVersion: '3.1.37'
       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 
-  
+  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       
+          uses: actions/deploy-pages@v2
   release:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: build-html
@@ -48,16 +46,16 @@ jobs:
       contents: write
 
     steps:
-          
+
       - uses: actions/checkout@v3
-    
+
       - uses: actions/download-artifact@v3
         with:
-           path: artifacts
+          path: artifacts
       - name: Display structure of downloaded files
         run: ls -R
-          
-      - name: Releases 
+
+      - name: Releases
         uses: softprops/action-gh-release@v1
         with:
-          files: ./artifacts/*/*       
+          files: ./artifacts/*/*

From a2f8b19774f7df9997247f863a1c59ddbb7159cd Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:21:15 +0100
Subject: [PATCH 5/7] fix yaml

---
 .github/workflows/build-wasm.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index 5827270..721f1ac 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -29,14 +29,14 @@ jobs:
       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
+    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

From 32e184df1351bf8bde23075a7485bff55f1c4e44 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:22:42 +0100
Subject: [PATCH 6/7] fix typo

---
 .github/workflows/build-wasm.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index 721f1ac..d4ca992 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -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: ${{ ((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'))) }
+    if: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop'))) }}
 
     runs-on: 'ubuntu-latest'
     permissions:

From 549fed4a69121567b791ed0a7b71597c233d2285 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez Lazo <30321688+EddyTheCo@users.noreply.github.com>
Date: Fri, 10 Nov 2023 20:24:19 +0100
Subject: [PATCH 7/7] fix typo

---
 .github/workflows/build-wasm.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-wasm.yaml b/.github/workflows/build-wasm.yaml
index d4ca992..6431b66 100644
--- a/.github/workflows/build-wasm.yaml
+++ b/.github/workflows/build-wasm.yaml
@@ -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: ${{ ((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'))) }}
+    if: ${{ ((github.event.pull_request.merged == true) && ((startsWith(github.base_ref, 'main'))||(startsWith(github.base_ref, 'develop')))) }}
 
     runs-on: 'ubuntu-latest'
     permissions: