From 94548254c4f75e58573628397ab95f20d3a8c11d Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Fri, 21 Jun 2024 13:48:05 +0200 Subject: [PATCH] chore: dependabot config and remove dev branch from workflows (#3027) Three changes: * do not run the git verify-app workflow on the 'dev' branch since it is no longer in use * configure dependabot to group together deps, reducing number of PRs and workflow runs. * add localization strings to commit in the pre-commit hook (this is how LL does it) dhis2 dependencies will still come as separate PRs (like analytics, ui, cli-app-scripts...) --- .github/dependabot.yml | 18 ++++++++++++++++-- .github/workflows/dhis2-verify-app.yml | 1 - .hooks/pre-commit | 4 +++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 51a5c167d..3c982e258 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,8 +1,22 @@ version: 2 updates: - package-ecosystem: npm - directory: '/' + directory: / schedule: interval: weekly - open-pull-requests-limit: 10 + open-pull-requests-limit: 5 versioning-strategy: increase + groups: + security: + applies-to: security-updates + update-types: + - minor + - patch + dependencies: + applies-to: version-updates + update-types: + - minor + - patch + exclude-patterns: + - '*@dhis2*' + - '*i18next*' diff --git a/.github/workflows/dhis2-verify-app.yml b/.github/workflows/dhis2-verify-app.yml index c6d3d4da7..bef711aa3 100644 --- a/.github/workflows/dhis2-verify-app.yml +++ b/.github/workflows/dhis2-verify-app.yml @@ -6,7 +6,6 @@ on: push: branches: - 'master' - - 'dev' tags: - '*' diff --git a/.hooks/pre-commit b/.hooks/pre-commit index 50ae359a6..66e20dd19 100755 --- a/.hooks/pre-commit +++ b/.hooks/pre-commit @@ -1,4 +1,6 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn d2-style check --staged +yarn d2-app-scripts i18n extract && \ + git add i18n && \ + yarn d2-style check --staged