diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 088e3536f6..5bda832993 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,48 +28,6 @@ updates: - "react" - "react-dom" - - 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" - - "@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'] - # npm in test/ - package-ecosystem: 'npm' @@ -77,25 +35,9 @@ updates: schedule: interval: 'weekly' - - 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.9' - commit-message: - prefix: '[stable-4.9] ' - schedule: - interval: "monthly" diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index c347a6cdb8..0000000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Ensure PR with changes to app functionality gets backport labels -# to be looked at by PR author and reviewer to keep or remove -# called by .github/workflows/labeler.yml - -backport-4.9: -- changed-files: - - any-glob-to-any-file: - - src/**/* - - test/**/* diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index b1f0551153..e09eed99a5 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -15,7 +15,6 @@ jobs: matrix: branch: - 'master' - - 'stable-4.9' steps: diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index be69a1b335..0000000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Add labels to pull requests against master -# uses logic in .github/labeler.yml - ---- -name: "Add labels to pull request" - -on: - pull_request_target: - branches: [ "master" ] - types: [ "opened" ] - -jobs: - triage: - permissions: - contents: read - pull-requests: write - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@v5 - if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' }} - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/README.md b/README.md index cee71a8213..30889d5f27 100644 --- a/README.md +++ b/README.md @@ -108,10 +108,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| [Table with component versions](https://github.com/ansible/galaxy_ng/wiki/Galaxy-NG-Version-Matrix)