Skip to content

Commit 640d69d

Browse files
authored
Remove everything to do with the permanent dependencies branch (#255)
1 parent a012912 commit 640d69d

5 files changed

Lines changed: 22 additions & 56 deletions

File tree

.github/dependabot.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,24 @@ updates:
55
schedule:
66
interval: daily
77
time: "05:24"
8-
target-branch: ci/dependency-updates
8+
target-branch: main
99
labels:
1010
- CI/CD
1111
- skip_changelog
12+
- package-ecosystem: pip
13+
directory: "/"
14+
schedule:
15+
interval: weekly
16+
day: monday
17+
time: "05:18"
18+
target-branch: main
19+
labels:
20+
- dependencies
21+
- skip_changelog
22+
groups:
23+
packages:
24+
applies-to: version-updates
25+
patterns: ["*"]
26+
security:
27+
applies-to: security-updates
28+
patterns: ["*"]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: CI - Activate auto-merging for dependencies PRs
1+
name: CI - Activate auto-merging for automated PRs
22

33
on:
44
pull_request_target:
5-
branches: [ci/dependency-updates]
5+
branches: [main]
66

77
jobs:
88
update-dependencies-branch:
99
name: External
1010
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.8.2
11-
if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'ci/update-pyproject' && github.actor == 'TEAM4-0' ) || ( github.event.pull_request.head.ref == 'pre-commit-ci-update-config' && github.actor == 'pre-commit-ci[bot]' ) )
11+
if: github.repository_owner == 'SINTEF' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( github.event.pull_request.head.ref == 'pre-commit-ci-update-config' && github.actor == 'pre-commit-ci[bot]' ) )
1212
secrets:
1313
PAT: ${{ secrets.RELEASE_PAT }}

.github/workflows/ci_cd_updated_main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ jobs:
1515
git_email: "Team4.0@SINTEF.no"
1616

1717
# Update dependency branch
18-
permanent_dependencies_branch: "ci/dependency-updates"
19-
default_repo_branch: main
18+
update_dependencies_branch: false
2019

2120
# Update documentation
2221
update_docs: true

.github/workflows/ci_check_dependencies.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/ci_update_dependencies.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)