Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove everything to do with the permanent dependencies branch #255

Merged
merged 1 commit into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,24 @@ updates:
schedule:
interval: daily
time: "05:24"
target-branch: ci/dependency-updates
target-branch: main
labels:
- CI/CD
- skip_changelog
- package-ecosystem: pip
directory: "/"
schedule:
interval: weekly
day: monday
time: "05:18"
target-branch: main
labels:
- dependencies
- skip_changelog
groups:
packages:
applies-to: version-updates
patterns: ["*"]
security:
applies-to: security-updates
patterns: ["*"]
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: CI - Activate auto-merging for dependencies PRs
name: CI - Activate auto-merging for automated PRs

on:
pull_request_target:
branches: [ci/dependency-updates]
branches: [main]

jobs:
update-dependencies-branch:
name: External
uses: SINTEF/ci-cd/.github/workflows/ci_automerge_prs.yml@v2.8.2
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]' ) )
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]' ) )
secrets:
PAT: ${{ secrets.RELEASE_PAT }}
3 changes: 1 addition & 2 deletions .github/workflows/ci_cd_updated_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
git_email: "Team4.0@SINTEF.no"

# Update dependency branch
permanent_dependencies_branch: "ci/dependency-updates"
default_repo_branch: main
update_dependencies_branch: false

# Update documentation
update_docs: true
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/ci_check_dependencies.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/ci_update_dependencies.yml

This file was deleted.