diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 202a8dde..985351ff 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -65,22 +65,22 @@ /** Docker images version */ { matchDatasources: ['docker'], - matchPackageNames: ['ghcr.io/osgeo/gdal'], versioning: 'regex:^(?.*)-(?\\d+)\\.(?\\d+)\\.(?\\d+)?$', + matchDepNames: ['ghcr.io/osgeo/gdal'], }, { matchDatasources: ['docker'], - matchPackageNames: ['python'], versioning: 'regex:^(?\\d+)\\.(?\\d+)\\.(?\\d+)?$', + matchDepNames: ['python'], }, /** Group Poetry packages */ { - matchPackageNames: ['poetry', 'pip'], matchPackagePrefixes: ['poetry-'], groupName: 'Poetry', automerge: true, separateMajorMinor: false, separateMinorPatch: false, + matchDepNames: ['poetry', 'pip'], }, /** Accept only the patch on stabilization branches */ { @@ -90,27 +90,27 @@ }, /** Support the 4 parts of shellcheck-py version with a v prefix */ { - matchPackageNames: ['shellcheck-py/shellcheck-py'], versioning: 'regex:^v(?\\d+)\\.(?\\d+)\\.(?\\d+)\\.(?\\d+)$', + matchDepNames: ['shellcheck-py/shellcheck-py'], }, /** Disable upgrading the supported Python version */ { matchFileNames: ['pyproject.toml'], - matchPackageNames: ['python'], enabled: false, + matchDepNames: ['python'], }, /** Only LTS version of Node */ { allowedVersions: '/(0|2|4|6|8)$/', - matchPackageNames: ['node'], enabled: false, + matchDepNames: ['node'], }, /** Group the Python update of the acceptance image */ { matchFileNames: ['acceptance_tests/*'], - matchPackageNames: ['python'], automerge: true, groupName: 'acceptance tests Python', + matchDepNames: ['python'], }, /** Group and auto merge the CI dependencies */ { diff --git a/.github/workflows/delete-old-workflows-run.yaml b/.github/workflows/delete-old-workflows-run.yaml deleted file mode 100644 index c43ef486..00000000 --- a/.github/workflows/delete-old-workflows-run.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Delete old workflow runs - -on: - schedule: - - cron: '0 0 * * *' - -env: - HAS_SECRETS: ${{ secrets.HAS_SECRETS }} - -jobs: - build: - name: Delete old workflow runs - runs-on: ubuntu-22.04 - timeout-minutes: 25 - - steps: - - name: Delete old workflow runs - uses: MajorScruffy/delete-old-workflow-runs@v0.3.0 - with: - repository: ${{ github.repository }} - older-than-seconds: 43200000 # 500 days - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index afb3ee2c..ba78a10b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -113,3 +113,11 @@ jobs: - name: Publish run: c2cciutils-publish if: env.HAS_SECRETS == 'HAS_SECRETS' + - run: git diff --exit-code --patch > /tmp/dpkg-versions.patch || true + if: failure() + - uses: actions/upload-artifact@v4 + with: + name: Update dpkg versions list.patch + path: /tmp/dpkg-versions.patch + retention-days: 1 + if: failure() diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml deleted file mode 100644 index b3e991a2..00000000 --- a/.github/workflows/pr-checks.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: Pull request check - -on: - pull_request: - types: - - opened - - reopened - - edited - - synchronize - -jobs: - build: - name: Pull request check - runs-on: ubuntu-22.04 - timeout-minutes: 5 - if: github.event.pull_request.user.login != 'renovate[bot]' - - steps: - - run: pip install --upgrade attrs - - uses: actions/checkout@v4 - - - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH} - - run: python3 -m pip install --user --pre c2cciutils[pr_checks] - - - name: Check pull request - run: c2cciutils-pull-request-checks - env: - GITHUB_EVENT: ${{ toJson(github) }} - GITHUB_TOKEN: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request-automation.yaml b/.github/workflows/pull-request-automation.yaml index 31478d1c..74240590 100644 --- a/.github/workflows/pull-request-automation.yaml +++ b/.github/workflows/pull-request-automation.yaml @@ -86,32 +86,3 @@ jobs: && startsWith(github.head_ref, 'dpkg-update/') && (github.event.action == 'opened' || github.event.action == 'reopened') - - name: Auto review and merge snyk auto fix - uses: actions/github-script@v7 - with: - script: |- - github.rest.pulls.createReview({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: context.payload.pull_request.number, - event: 'APPROVE', - }); - github.graphql(` - mutation { - enablePullRequestAutoMerge(input: { - pullRequestId: "${context.payload.pull_request.node_id}", - mergeMethod: SQUASH, - }) { - pullRequest { - autoMergeRequest { - enabledAt - } - } - } - } - `) - if: |- - github.event.pull_request.user.login == 'c2c-bot-gis-ci-2' - && startsWith(github.head_ref, 'snyk-fix/') - && (github.event.action == 'opened' - || github.event.action == 'reopened')