diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 754fcf24075e..2e2c31da2582 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,6 +28,10 @@ updates: # Keep both psycopg and psycopg-c together patterns: - "psycopg*" + python-package: + # Keep rest of package together + patterns: + - "*" - package-ecosystem: github-actions directory: "/" schedule: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47eca4aae26d..5a4ebc3ac03a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: pull_request: merge_group: types: [checks_requested] - workflow_dispatch: # generally only for the "combine-prs" workflow + workflow_dispatch: permissions: id-token: write contents: read diff --git a/.github/workflows/combine-prs.yml b/.github/workflows/combine-prs.yml deleted file mode 100644 index 2ad5828484e4..000000000000 --- a/.github/workflows/combine-prs.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Origin: https://github.com/marketplace/actions/combine-prs - -name: 'Combine PRs' - -# Controls when the action will run - in this case triggered manually -on: - workflow_dispatch: - inputs: - ignoreLabel: - description: 'Exclude PRs with this label' - required: true - default: 'blocked' - -# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token -permissions: - contents: write - pull-requests: write - checks: read - actions: write - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "combine-prs" - combine-prs: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - steps: - - name: Use GitHub App Token - uses: wow-actions/use-app-token@v2.0.2 - id: generate_token - with: - app_id: ${{ secrets.COMBINE_PRS_APP_ID }} - private_key: ${{ secrets.COMBINE_PRS_PRIVATE_KEY }} - fallback: ${{ secrets.GITHUB_TOKEN }} # fall back to the default token if the app token is - - - name: combine-prs - id: combine-prs - uses: github/combine-prs@v5.0.0 - with: - github_token: ${{ steps.generate_token.outputs.BOT_TOKEN }} - ignore_label: ${{ github.event.inputs.ignoreLabel || 'blocked' }} diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 2dad3f09216a..ab0640b0bd3f 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -6,7 +6,7 @@ on: pull_request: merge_group: types: [checks_requested] - workflow_dispatch: # generally only for the "combine-prs" workflow + workflow_dispatch: permissions: contents: read concurrency: