Skip to content

Commit c875113

Browse files
committed
Resolved conflicts and merged latest changes from master
2 parents ce9e5f5 + 4cfac72 commit c875113

File tree

453 files changed

+45642
-12337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

453 files changed

+45642
-12337
lines changed

.github/dependabot.yml

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: "weekly"
12+
day: "monday"
13+
time: "01:00"
14+
timezone: "Asia/Tokyo"
1215
ignore:
1316
- dependency-name: "*"
1417
update-types: [ "version-update:semver-major" ]
@@ -24,6 +27,9 @@ updates:
2427
directory: "/"
2528
schedule:
2629
interval: "weekly"
30+
day: "monday"
31+
time: "01:00"
32+
timezone: "Asia/Tokyo"
2733

2834
- package-ecosystem: "github-actions"
2935
target-branch: "3"
@@ -34,6 +40,9 @@ updates:
3440
directory: "/"
3541
schedule:
3642
interval: "weekly"
43+
day: "monday"
44+
time: "01:00"
45+
timezone: "Asia/Tokyo"
3746

3847
- package-ecosystem: "github-actions"
3948
target-branch: "3.16"
@@ -44,6 +53,9 @@ updates:
4453
directory: "/"
4554
schedule:
4655
interval: "weekly"
56+
day: "monday"
57+
time: "01:00"
58+
timezone: "Asia/Tokyo"
4759

4860
- package-ecosystem: "github-actions"
4961
target-branch: "3.15"
@@ -54,6 +66,9 @@ updates:
5466
directory: "/"
5567
schedule:
5668
interval: "weekly"
69+
day: "monday"
70+
time: "01:00"
71+
timezone: "Asia/Tokyo"
5772

5873
- package-ecosystem: "github-actions"
5974
target-branch: "3.14"
@@ -64,6 +79,9 @@ updates:
6479
directory: "/"
6580
schedule:
6681
interval: "weekly"
82+
day: "monday"
83+
time: "01:00"
84+
timezone: "Asia/Tokyo"
6785

6886
- package-ecosystem: "github-actions"
6987
target-branch: "3.13"
@@ -74,13 +92,6 @@ updates:
7492
directory: "/"
7593
schedule:
7694
interval: "weekly"
77-
78-
- package-ecosystem: "github-actions"
79-
target-branch: "3.12"
80-
groups:
81-
actions on branch 3.12:
82-
patterns:
83-
- "*"
84-
directory: "/"
85-
schedule:
86-
interval: "weekly"
95+
day: "monday"
96+
time: "01:00"
97+
timezone: "Asia/Tokyo"

.github/workflows/assign-dependabot-pr-reviewers.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: github.actor == 'dependabot[bot]'
1212

13-
permissions:
14-
pull-requests: write
15-
1613
steps:
1714
- name: Assign ScalarDB team as reviewers for Dependabot PRs
1815
env:
19-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
GH_TOKEN: ${{ secrets.ASSIGN_PR_REVIEWERS_PAT }}
2017
PR_NUMBER: ${{ github.event.pull_request.number }}
2118
REPOSITORY: ${{ github.repository }}
2219
run: gh pr edit $PR_NUMBER --repo $REPOSITORY --add-reviewer scalar-labs/scalardb

0 commit comments

Comments
 (0)