Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into ubuntu24
Browse files Browse the repository at this point in the history
  • Loading branch information
tigercosmos committed Aug 16, 2024
2 parents 4a7f697 + b27e84f commit 9963098
Show file tree
Hide file tree
Showing 313 changed files with 47,492 additions and 43,329 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PointerAlignment: Left
AccessModifierOffset: -4
AlignTrailingComments: true
AllowShortEnumsOnASingleLine: false
BreakStringLiterals: true
BreakStringLiterals: false
AlignArrayOfStructures: Left
BreakArrays: true
SpacesBeforeTrailingComments: 2
Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ updates:
target-branch: "dev"
labels:
- "automated-pr"
groups:
actions-dependencies:
patterns:
- "*"

- package-ecosystem: "pip"
directories:
Expand All @@ -17,3 +21,7 @@ updates:
target-branch: "dev"
labels:
- "automated-pr"
groups:
pip-dependencies:
patterns:
- "*"
8 changes: 4 additions & 4 deletions .github/workflows/auto_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
ref: dev
- name: Setup Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
with:
python-version: "3.8.x"
- name: Run update
Expand Down Expand Up @@ -46,11 +46,11 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
ref: dev
- name: Setup Python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
with:
python-version: "3.9.x"
- name: Run update
Expand Down
Loading

0 comments on commit 9963098

Please sign in to comment.