Skip to content
Open
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
13 changes: 6 additions & 7 deletions .github/workflows/comment-and-close.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: comment-and-close

on:
issues:
types: [opened]

jobs:
comment-and-close:
runs-on: ubuntu-latest
steps:
- uses: vardevs/candc@v1
with:
close-comment: 'If you would like to file a bug report or feature request, please refer to our issue tracker: https://jira.dhis2.org'
exempt-users: dhis2-bot,dependabot,kodiakhq
github-token: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}}
uses: dhis2/workflows-platform/.github/workflows/comment-and-close.yml@v1
if: '!contains(fromJson(''["dhis2-bot", "kodiakhq", "dependabot"]''), github.event.issue.sender.login)'
with:
issue_number: ${{ github.event.issue.number }}
39 changes: 39 additions & 0 deletions .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: deploy-pr

on:
pull_request:

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

jobs:
deploy:
runs-on: ubuntu-latest
if: '!github.event.pull_request.head.repo.fork'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn d2-app-scripts build --standalone
env:
NODE_OPTIONS: --openssl-legacy-provider
- id: netlify-deploy
uses: nwtgck/actions-netlify@v3
timeout-minutes: 1
with:
github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
github-deployment-environment: netlify
github-deployment-description: PR Preview on Netlify
deploy-message: ${{ github.event.pull_request.title }}
enable-pull-request-comment: true
enable-commit-comment: true
enable-commit-status: true
alias: pr-${{ github.event.number }}
publish-dir: build/app
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.DHIS2_BOT_NETLIFY_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
17 changes: 17 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: deploy-production

on:
push:
branches:
- master

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

jobs:
deploy:
uses: dhis2/workflows-platform/.github/workflows/deploy-production.yml@v1
secrets: inherit
with:
branch: master
51 changes: 0 additions & 51 deletions .github/workflows/dhis2-preview-pr.yml

This file was deleted.

122 changes: 0 additions & 122 deletions .github/workflows/dhis2-verify-app.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/dhis2-verify-commits.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .github/workflows/lint-pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: lint-pr-title

on:
pull_request:
types: ['opened', 'edited', 'reopened', 'synchronize']

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

jobs:
lint-pr-title:
uses: dhis2/workflows-platform/.github/workflows/lint-pr-title.yml@v1
49 changes: 49 additions & 0 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: test-and-release

on: push

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
# Cancel previous runs if not on a release branch
cancel-in-progress: ${{ !contains(fromJSON('["refs/heads/master", "refs/heads/main"]'), github.ref) }}

jobs:
lint-commits:
uses: dhis2/workflows-platform/.github/workflows/lint-commits.yml@v1
lint:
uses: dhis2/workflows-platform/.github/workflows/lint.yml@v1
test:
uses: dhis2/workflows-platform/.github/workflows/test.yml@v1
release:
needs: [lint-commits, lint, test]
runs-on: ubuntu-latest
# Skips forks and dependabot PRs
if: '!github.event.push.repository.fork'
env:
GIT_AUTHOR_NAME: '@dhis2-bot'
GIT_AUTHOR_EMAIL: apps@dhis2.org
GIT_COMMITTER_NAME: '@dhis2-bot'
GIT_COMMITTER_EMAIL: apps@dhis2.org
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn d2-app-scripts build
env:
NODE_OPTIONS: --openssl-legacy-provider
- uses: dhis2/action-semantic-release@master
with:
publish-apphub: true
publish-github: true
apphub-channel: stable
github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
apphub-token: ${{ secrets.DHIS2_BOT_APPHUB_TOKEN }}
- uses: dhis2/deploy-build@master
with:
build-dir: build/app
github-token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion cypress/integration/maintenance/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Before(() => {
'softDeletedDataValueRemoval',
'softDeletedEventRemoval',
'softDeletedEnrollmentRemoval',
'softDeletedTrackedEntityInstanceRemoval',
'softDeletedTrackedEntityRemoval',
'periodPruning',
'expiredInvitationsClear',
'sqlViewsDrop',
Expand Down
2 changes: 1 addition & 1 deletion src/i18n-keys.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const i18nKeys = {
softDeletedEnrollmentRemoval: i18n.t(
'Permanently remove soft deleted enrollments'
),
softDeletedTrackedEntityInstanceRemoval: i18n.t(
softDeletedTrackedEntityRemoval: i18n.t(
'Permanently remove soft deleted tracked entity instances'
),
periodPruning: i18n.t('Prune periods'),
Expand Down
Loading
Loading