Merge pull request #41 from helium/develop

Develop
helium · Mar 19, 2024 · e2f6a84 · e2f6a84
2 parents 4f1da7c + f5a6cbe
commit e2f6a84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - main
+      - develop
   workflow_dispatch:
 
 jobs:
@@ -20,7 +21,7 @@ jobs:
       - name: Run tests
         run: npm test
   staging:
-    if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true && github.ref_name == 'develop' }}
     env:
       environment: staging
     runs-on: ubuntu-latest

diff --git a/src/tests/index.test.ts b/src/tests/index.test.ts
@@ -107,4 +107,4 @@ describe('index', () => {
 
 		expect(errorHandler).toBeCalled();
 	});
-});
+});