diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 674dbe6be2..f341266b06 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -54,134 +54,6 @@ updates: - 'version-update:semver-minor' - 'version-update:semver-patch' - - 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' - ignore: - - dependency-name: '@lingui/*' - update-types: - - 'version-update:semver-major' - - dependency-name: '@patternfly/*' - update-types: - - 'version-update:semver-major' - - dependency-name: 'eslint' - 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' - - dependency-name: 'react-router-dom' - update-types: - - 'version-update:semver-major' - - dependency-name: 'monaco-editor' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - dependency-name: 'react-monaco-editor' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - dependency-name: 'sass' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - 'version-update:semver-patch' - - dependency-name: 'typescript-eslint' - update-types: - - 'version-update:semver-major' - - - package-ecosystem: 'npm' - directory: '/' - target-branch: 'stable-4.9' - schedule: - interval: 'monthly' - commit-message: - prefix: '[stable-4.9] ' - 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' - ignore: - - dependency-name: '@lingui/*' - update-types: - - 'version-update:semver-major' - - dependency-name: '@patternfly/*' - update-types: - - 'version-update:semver-major' - - dependency-name: 'eslint' - 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' - - dependency-name: 'react-router-dom' - update-types: - - 'version-update:semver-major' - - dependency-name: 'monaco-editor' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - dependency-name: 'react-monaco-editor' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - dependency-name: 'sass' - update-types: - - 'version-update:semver-major' - - 'version-update:semver-minor' - - 'version-update:semver-patch' - - dependency-name: 'typescript-eslint' - update-types: - - 'version-update:semver-major' - # npm in test/ - package-ecosystem: 'npm' @@ -189,41 +61,9 @@ 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' - schedule: - interval: 'monthly' - commit-message: - prefix: '[stable-4.9] ' - # github-actions - package-ecosystem: 'github-actions' directory: '/' 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' - commit-message: - prefix: '[stable-4.9] ' - schedule: - interval: 'monthly' diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index f3208307f1..e09eed99a5 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -15,8 +15,6 @@ jobs: matrix: branch: - 'master' - - 'stable-4.9' - - 'stable-4.10' steps: diff --git a/README.md b/README.md index d09d02491f..2a6d66e47d 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,5 @@ List by branches: ## Version mapping Our branches, backport labels, releases and tags use AAH versions, but Jira uses AAP versions. -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)