Skip to content

Commit

Permalink
Merge pull request #47 from helium/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
deasydoesit authored Mar 19, 2024
2 parents 7a94909 + 990f918 commit 998cc4c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_prod.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test and Deploy to Prod
name: Deploy to Prod

on:
workflow_dispatch:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/deploy_staging.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
name: Test and Deploy to Staging
name: Deploy to Staging

on:
pull_request:
branches:
- develop
push:
branches:
- develop
types: [ closed ]

jobs:
tests:
Expand All @@ -19,7 +15,7 @@ jobs:
- name: Run tests
run: npm test
staging:
if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true }}
if: github.event.pull_request.merged == true && && github.ref_name == 'develop'
env:
environment: staging
runs-on: ubuntu-latest
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/test_develop.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Test PR to Develop

on:
pull_request:
branches:
- develop

jobs:
tests:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- name: Install modules
run: npm install
- name: Run tests
run: npm test
2 changes: 1 addition & 1 deletion src/tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ describe('index', () => {

expect(errorHandler).toBeCalled();
});
});
});

0 comments on commit 998cc4c

Please sign in to comment.