diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 088e3536f6..f988c48b75 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,6 +28,48 @@ updates: - "react" - "react-dom" + - package-ecosystem: 'npm' + directory: '/' + target-branch: 'stable-4.10' + schedule: + interval: 'monthly' + commit-message: + prefix: '[stable-4.10] ' + groups: + babel: + patterns: + - "@babel/*" + - "babel-loader" + eslint: + patterns: + - "eslint" + - "eslint-config-*" + - "eslint-plugin-*" + - "typescript-eslint" + lingui: + patterns: + - "@lingui/*" + patternfly: + patterns: + - "@patternfly/*" + react: + patterns: + - "react" + - "react-dom" + - "@types/react" + - "@types/react-dom" + ignore: + - dependency-name: '@lingui/*' + update-types: ['version-update:semver-major'] + - dependency-name: '@patternfly/*' + update-types: ['version-update:semver-major'] + - dependency-name: '@types/*' + update-types: ['version-update:semver-major'] + - dependency-name: 'react' + update-types: ['version-update:semver-major'] + - dependency-name: 'react-dom' + update-types: ['version-update:semver-major'] + - package-ecosystem: 'npm' directory: '/' target-branch: 'stable-4.9' @@ -77,6 +119,14 @@ updates: schedule: interval: 'weekly' + - package-ecosystem: 'npm' + directory: '/test' + target-branch: 'stable-4.10' + schedule: + interval: 'monthly' + commit-message: + prefix: '[stable-4.10] ' + - package-ecosystem: 'npm' directory: '/test' target-branch: 'stable-4.9' @@ -92,6 +142,14 @@ updates: schedule: interval: 'weekly' + - package-ecosystem: "github-actions" + directory: "/" + target-branch: 'stable-4.10' + commit-message: + prefix: '[stable-4.10] ' + schedule: + interval: "monthly" + - package-ecosystem: "github-actions" directory: "/" target-branch: 'stable-4.9' diff --git a/.github/labeler.yml b/.github/labeler.yml index c347a6cdb8..88cfd09759 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -7,3 +7,9 @@ backport-4.9: - any-glob-to-any-file: - src/**/* - test/**/* + +backport-4.10: +- changed-files: + - any-glob-to-any-file: + - src/**/* + - test/**/* diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index b1f0551153..f3208307f1 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -16,6 +16,7 @@ jobs: branch: - 'master' - 'stable-4.9' + - 'stable-4.10' steps: diff --git a/README.md b/README.md index cee71a8213..fca8aace78 100644 --- a/README.md +++ b/README.md @@ -113,5 +113,6 @@ To map between the two: |AAP version|AAH version| |-|-| |2.4|4.9| +|2.5|4.10| [Table with component versions](https://github.com/ansible/galaxy_ng/wiki/Galaxy-NG-Version-Matrix) diff --git a/ansible-hub-ui/__init__.py b/ansible-hub-ui/__init__.py index 7108555aa2..17c1a855c0 100644 --- a/ansible-hub-ui/__init__.py +++ b/ansible-hub-ui/__init__.py @@ -1 +1 @@ -__version__ = "4.10.0dev" +__version__ = "4.11.0dev"