From 368cbd929a99a21f17304fd6f5d8afab7aa2f131 Mon Sep 17 00:00:00 2001 From: Melvin <70433111+MelvinKl@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:27:31 +0100 Subject: [PATCH 1/5] fix: dependency-update pipeline --- .github/workflows/dependency-checker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-checker.yaml b/.github/workflows/dependency-checker.yaml index 9f4e61f89..001e97c6e 100644 --- a/.github/workflows/dependency-checker.yaml +++ b/.github/workflows/dependency-checker.yaml @@ -35,7 +35,7 @@ jobs: echo "Pr for $dirpath already exists. Skipping." else # Create PR - branch_name="dependency-updater-$dirpath" + branch_name="dependency-updater-$dirpath-${{ github.run_id }}" git checkout -b "$branch_name" git add "$file" git commit -m "chore: dependency update" From bd752be685ab7b173a66923c500e1f891bab9120 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Thu, 21 Nov 2024 07:26:31 +0000 Subject: [PATCH 2/5] create new PRs every night --- .github/workflows/dependency-checker.yaml | 30 +++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dependency-checker.yaml b/.github/workflows/dependency-checker.yaml index 001e97c6e..93f616cd0 100644 --- a/.github/workflows/dependency-checker.yaml +++ b/.github/workflows/dependency-checker.yaml @@ -32,18 +32,22 @@ jobs: # Check if a PR already exists for the package if gh pr list --state open | grep -q "${pr_name}"; then - echo "Pr for $dirpath already exists. Skipping." - else - # Create PR - branch_name="dependency-updater-$dirpath-${{ github.run_id }}" - git checkout -b "$branch_name" - git add "$file" - git commit -m "chore: dependency update" - git push --set-upstream origin "$branch_name" - echo $(git status) - gh pr create --title "$pr_name" --body "Automated dependency update" --base "main" - git checkout main - sleep 30 # prevent rate limit. - fi + echo "Pr for $dirpath already exists. Deleting old PR." + pr_id=$(gh pr list --state open --json id --search "$pr_name" -q '.[0].id') + gh pr close "$pr_id" --delete-branch + + fi + + # Create PR + branch_name="dependency-updater-$dirpath-${{ github.run_id }}" + git checkout -b "$branch_name" + git add "$file" + git commit -m "chore: dependency update" + git push --set-upstream origin "$branch_name" + echo $(git status) + gh pr create --title "$pr_name" --body "Automated dependency update" --base "main" + git checkout main + sleep 30 # prevent rate limit. + done From 03041194beeb943f5642550066a7fc5e334bc751 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Thu, 21 Nov 2024 07:33:30 +0000 Subject: [PATCH 3/5] fix --- .github/workflows/dependency-checker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-checker.yaml b/.github/workflows/dependency-checker.yaml index 93f616cd0..b9f57ddfb 100644 --- a/.github/workflows/dependency-checker.yaml +++ b/.github/workflows/dependency-checker.yaml @@ -33,8 +33,8 @@ jobs: # Check if a PR already exists for the package if gh pr list --state open | grep -q "${pr_name}"; then echo "Pr for $dirpath already exists. Deleting old PR." - pr_id=$(gh pr list --state open --json id --search "$pr_name" -q '.[0].id') - gh pr close "$pr_id" --delete-branch + pr_number=$(gh pr list --state open --json number --search "$pr_name" -q '.[0].number') + gh pr close "$pr_number" --delete-branch fi From 1888d9d3c52326b5abf62d931e4a3e1a68a31bff Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Thu, 21 Nov 2024 07:40:51 +0000 Subject: [PATCH 4/5] fix --- .github/workflows/dependency-checker.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dependency-checker.yaml b/.github/workflows/dependency-checker.yaml index b9f57ddfb..ea16c5aea 100644 --- a/.github/workflows/dependency-checker.yaml +++ b/.github/workflows/dependency-checker.yaml @@ -12,6 +12,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Install Python uses: actions/setup-python@v5 with: From 1aafa973a83ccc3f34c87e2975e467dab276003b Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Thu, 21 Nov 2024 07:44:41 +0000 Subject: [PATCH 5/5] fix --- .github/workflows/dependency-checker.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dependency-checker.yaml b/.github/workflows/dependency-checker.yaml index ea16c5aea..b9f57ddfb 100644 --- a/.github/workflows/dependency-checker.yaml +++ b/.github/workflows/dependency-checker.yaml @@ -12,8 +12,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Install Python uses: actions/setup-python@v5 with: