Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: node-hapi (Dev & Prod)
on:
push:
branches:
- develop
- master
- dev
- main
jobs:
# docker-build-push-deploy:
# name: Docker build, push and deploy
Expand All @@ -16,7 +16,7 @@ jobs:
# run: echo ::set-output name=stage::${GITHUB_REF#refs/*/}
# - name: Set env.ENV_NAME
# run: |
# if [[ ${{steps.vars.outputs.stage}} == 'master' ]]; then
# if [[ ${{steps.vars.outputs.stage}} == 'main' ]]; then
# echo "ENV_NAME=prod" >> "$GITHUB_ENV"
# else
# echo "ENV_NAME=dev" >> "$GITHUB_ENV"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Jest Coverage Report with Annotations (CI)
on:
pull_request:
branches:
- master
- main
jobs:
coverage_report:
name: Jest Coverage Report
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nodejs-hapi-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Nodejs Hapi Template
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
build_and_test:
name: Build & Test
Expand All @@ -19,5 +19,7 @@ jobs:
run: yarn
- name: Lint
run: yarn lint
- name: Build
run: yarn build:dev
- name: Test
run: yarn test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<img align="left" src="https://github.com/wednesday-solutions/nodejs-hapi-template/blob/master/nodejs_hapi_template_github.svg" width="480" height="560" />
<img align="left" src="https://github.com/wednesday-solutions/nodejs-hapi-template/blob/main/nodejs_hapi_template_github.svg" width="480" height="560" />

<div>
<a href="https://www.wednesday.is?utm_source=gthb&utm_medium=repo&utm_campaign=serverless" align="left" style="margin-left: 0;">
Expand Down