Skip to content

Commit

Permalink
Merge pull request #235 from dhis2/development
Browse files Browse the repository at this point in the history
chore(release): merge development to master
  • Loading branch information
Birkbjo authored Oct 21, 2022
2 parents 2dbfc71 + 0334733 commit 6405fd4
Show file tree
Hide file tree
Showing 190 changed files with 11,809 additions and 9,590 deletions.
7 changes: 7 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": [
"config:base",
":dependencyDashboardApproval",
":enableVulnerabilityAlerts"
]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'dhis2: pr preview'
name: 'dhis2: netlify deploy pr'

# Requirements:
#
Expand All @@ -17,7 +17,7 @@ concurrency:
cancel-in-progress: true

jobs:
preview:
deploy:
runs-on: ubuntu-latest
if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
steps:
Expand Down
56 changes: 56 additions & 0 deletions .github/workflows/dhis2-netlify-deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: 'dhis2: netlify deploy production'

# Requirements:
#
# - Org secrets:
# DHIS2_BOT_NETLIFY_TOKEN
# DHIS2_BOT_GITHUB_TOKEN
# - Repo secrets:
# NETLIFY_SITE_ID
# - Customize the 'jobs.build.steps.netlify-deploy.publish-dir' property

on:
push:
branches:
- development

concurrency:
group: ${{ github.workflow}}-${{ github.ref }}
cancel-in-progress: true

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 16.x

- uses: c-hive/gha-yarn-cache@v1
- run: yarn install --frozen-lockfile

- name: Build
run: yarn d2-app-scripts build --standalone

- name: Deploy
id: netlify-deploy
uses: nwtgck/actions-netlify@v1.2.2
timeout-minutes: 1
with:
github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
github-deployment-environment: 'netlify'
github-deployment-description: 'Production Deploy on Netlify'
deploy-message: Github actions production deploy
enable-pull-request-comment: false
enable-commit-comment: true
enable-commit-status: true
production-branch: development
production-deploy: true
# customize according to project needs
publish-dir: 'build/app'
env:
# org secret
NETLIFY_AUTH_TOKEN: ${{ secrets.DHIS2_BOT_NETLIFY_TOKEN }}
# repo secret
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ cypress.env.json
.vscode
.env.development.local
.env.test.local
.env.production.local
.env.production.local
cypress/screenshots/*
Loading

0 comments on commit 6405fd4

Please sign in to comment.