From 640d69d84c7e178f361800d56c3a7ac4d592ee28 Mon Sep 17 00:00:00 2001
From: Casper Welzel Andersen <43357585+CasperWA@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:39:02 +0200
Subject: [PATCH] Remove everything to do with the permanent dependencies
 branch (#255)

---
 .github/dependabot.yml                        | 19 ++++++++++++-
 ...prs.yml => ci_automerge_automated_prs.yml} |  6 ++--
 .github/workflows/ci_cd_updated_main.yml      |  3 +-
 .github/workflows/ci_check_dependencies.yml   | 22 ---------------
 .github/workflows/ci_update_dependencies.yml  | 28 -------------------
 5 files changed, 22 insertions(+), 56 deletions(-)
 rename .github/workflows/{ci_automerge_dependency_prs.yml => ci_automerge_automated_prs.yml} (59%)
 delete mode 100644 .github/workflows/ci_check_dependencies.yml
 delete mode 100644 .github/workflows/ci_update_dependencies.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index cdf7784e..5f57aa72 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -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: ["*"]
diff --git a/.github/workflows/ci_automerge_dependency_prs.yml b/.github/workflows/ci_automerge_automated_prs.yml
similarity index 59%
rename from .github/workflows/ci_automerge_dependency_prs.yml
rename to .github/workflows/ci_automerge_automated_prs.yml
index e78f557d..31797f4a 100644
--- a/.github/workflows/ci_automerge_dependency_prs.yml
+++ b/.github/workflows/ci_automerge_automated_prs.yml
@@ -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 }}
diff --git a/.github/workflows/ci_cd_updated_main.yml b/.github/workflows/ci_cd_updated_main.yml
index 8d4fd32e..c26e2943 100644
--- a/.github/workflows/ci_cd_updated_main.yml
+++ b/.github/workflows/ci_cd_updated_main.yml
@@ -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
diff --git a/.github/workflows/ci_check_dependencies.yml b/.github/workflows/ci_check_dependencies.yml
deleted file mode 100644
index 8121f8ac..00000000
--- a/.github/workflows/ci_check_dependencies.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: CI - Check dependencies PR
-
-on:
-  schedule:
-    # At 7:30 every Monday (5:30 UTC)
-    - cron: "30 5 * * 1"
-  workflow_dispatch:
-
-jobs:
-  check-dependencies:
-    name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_check_pyproject_dependencies.yml@v2.8.2
-    if: github.repository_owner == 'SINTEF'
-    with:
-      git_username: "TEAM 4.0[bot]"
-      git_email: "Team4.0@SINTEF.no"
-      permanent_dependencies_branch: "ci/dependency-updates"
-      python_version: "3.9"
-      install_extras: "[dev]"
-      pr_labels: "CI/CD,skip_changelog"
-    secrets:
-      PAT: ${{ secrets.RELEASE_PAT }}
diff --git a/.github/workflows/ci_update_dependencies.yml b/.github/workflows/ci_update_dependencies.yml
deleted file mode 100644
index ccee5554..00000000
--- a/.github/workflows/ci_update_dependencies.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: CI - Update accummulated dependencies PR
-
-on:
-  schedule:
-    # At 6:30 UTC on the first in the month
-    - cron: "30 6 1 * *"
-  workflow_dispatch:
-
-jobs:
-  create-collected-pr:
-    name: External
-    uses: SINTEF/ci-cd/.github/workflows/ci_update_dependencies.yml@v2.8.2
-    if: github.repository_owner == 'SINTEF'
-    with:
-      # General
-      git_username: "TEAM 4.0[bot]"
-      git_email: "Team4.0@SINTEF.no"
-      permanent_dependencies_branch: "ci/dependency-updates"
-      default_repo_branch: main
-      pr_labels: "CI/CD,skip_changelog"
-      extra_to_dos: "- [ ] Make sure that the PR is **squash** merged, with a sensible commit message."
-
-      # Update pre-commit hooks
-      update_pre-commit: true
-      python_version: "3.9"
-      install_extras: "[pre-commit]"
-    secrets:
-      PAT: ${{ secrets.RELEASE_PAT }}