Skip to content

Commit

Permalink
chore: sync with ecsact_common
Browse files Browse the repository at this point in the history
  • Loading branch information
seaubot committed Jun 21, 2024
1 parent 611c9f0 commit 88b6497
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.2
7.2.0
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ name: main

on:
pull_request:
types: [ labeled, opened, synchronize, reopened ]
merge_group:

jobs:
Expand All @@ -26,7 +25,7 @@ jobs:
with: { clang-format-version: "18" }

test-windows:
if: github.event_name == 'merge_group' || contains(github.event.pull_request.labels.*.name, 'ci:always')
if: (github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]') || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]')
runs-on: windows-latest
steps:
- uses: actions/cache@v4
Expand All @@ -42,7 +41,7 @@ jobs:
working-directory: test

test-linux:
if: github.event_name == 'merge_group' || contains(github.event.pull_request.labels.*.name, 'ci:always')
if: (github.event_name == 'pull_request' && github.event.pull_request.user.login == 'renovate[bot]') || (github.event_name == 'merge_group' && github.event.pull_request.user.login != 'renovate[bot]')
runs-on: ubuntu-latest
steps:
- uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"extends": [
"github>ecsact-dev/renovate-config"
]
}
}

0 comments on commit 88b6497

Please sign in to comment.