Skip to content

Commit

Permalink
Update to the latest dev-tools and make code build with bazel 6.x (#68)
Browse files Browse the repository at this point in the history
* Make code work with the latest bazel (6.2.1)

* Update dev-tools submodule

* Format apply and fix windows build
  • Loading branch information
onelxj authored Jul 4, 2023
1 parent e078b06 commit d2d7a6a
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 141 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
# When manually running this workflow:
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
debug_enabled:
description: 'Enable tmate debugging'
description: "Enable tmate debugging"
type: boolean
default: false

Expand All @@ -31,7 +31,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macos-latest", "ubuntu-latest", "windows-latest"]
# 'windows-latest' (windows-2022) is broken due to a github runner update.
# See https://github.com/actions/runner-images/issues/7662 for more details.
os: ["macos-latest", "ubuntu-latest", "windows-2019"]
defaults:
run:
shell: bash
Expand All @@ -40,7 +42,7 @@ jobs:
# Checkout the repository under $GITHUB_WORKSPACE.
- uses: actions/checkout@v2
with:
submodules: 'recursive'
submodules: "recursive"

- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# style checks.
- uses: actions/checkout@v2
with:
submodules: 'recursive'
submodules: "recursive"

# Call the composite action to check files
# for correct code style. This action (action.yml)
Expand Down
16 changes: 8 additions & 8 deletions .mergequeue/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ version: 1.0.0
merge_rules:
labels:
trigger: mergequeue-ready
skip_line: ''
skip_line: ""
merge_failed: mergequeue-failed
skip_delete_branch: ''
skip_delete_branch: ""
update_latest: true
delete_branch: true
use_rebase: true
Expand All @@ -13,24 +13,24 @@ merge_rules:
preconditions:
number_of_approvals: 1
required_checks:
- check_code_style (ubuntu-latest)
- Build and Test (windows-latest)
- Build and Test (ubuntu-latest)
- Build and Test (macos-latest)
- check_code_style (ubuntu-latest)
- Build and Test (windows-latest)
- Build and Test (ubuntu-latest)
- Build and Test (macos-latest)
use_github_mergeability: false
conversation_resolution_required: true
merge_mode:
type: default
parallel_mode: null
auto_update:
enabled: false
label: ''
label: ""
max_runs_for_update: 0
merge_commit:
use_title_and_body: false
merge_strategy:
name: squash
override_labels:
squash: mergequeue-squash
merge: ''
merge: ""
rebase: mergequeue-rebase
Loading

0 comments on commit d2d7a6a

Please sign in to comment.