Skip to content

Commit

Permalink
CI updates
Browse files Browse the repository at this point in the history
This is done by the automated script named upgrade-c2cciutils-to-1.7
  • Loading branch information
sbrunner committed Jun 4, 2024
1 parent 082c25c commit 57deeea
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 88 deletions.
14 changes: 7 additions & 7 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,22 @@
/** Docker images version */
{
matchDatasources: ['docker'],
matchPackageNames: ['ghcr.io/osgeo/gdal'],
versioning: 'regex:^(?<compatibility>.*)-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$',
matchDepNames: ['ghcr.io/osgeo/gdal'],
},
{
matchDatasources: ['docker'],
matchPackageNames: ['python'],
versioning: 'regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\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 */
{
Expand All @@ -90,27 +90,27 @@
},
/** Support the 4 parts of shellcheck-py version with a v prefix */
{
matchPackageNames: ['shellcheck-py/shellcheck-py'],
versioning: 'regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)\\.(?<build>\\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 */
{
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/delete-old-workflows-run.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
29 changes: 0 additions & 29 deletions .github/workflows/pr-checks.yaml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/pull-request-automation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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')

0 comments on commit 57deeea

Please sign in to comment.