Skip to content

Commit

Permalink
Merge branch 'main' into gulu-goolu-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
jsharpe authored Jan 2, 2025
2 parents e283961 + 7e0fafb commit e3ea9ba
Show file tree
Hide file tree
Showing 182 changed files with 9,607 additions and 4,087 deletions.
24 changes: 20 additions & 4 deletions .bazelci/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ tasks:
- "//..."
test_targets:
- "//..."
# TODO: https://github.com/bazelbuild/rules_foreign_cc/issues/495
# TODO: https://github.com/bazel-contrib/rules_foreign_cc/issues/495
- "-//test:shell_method_symlink_contents_to_dir_test"
- "-//test:shell_script_inner_fun_test"
build_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
test_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
ubuntu1804_examples_standalone:
name: Examples (spawn_strategy=standalone)
platform: ubuntu1804
Expand All @@ -44,12 +46,14 @@ tasks:
- "dbg"
- "--spawn_strategy=standalone"
- "--noenable_bzlmod"
- "--enable_workspace"
test_targets: *linux_targets_standalone
test_flags:
- "-c"
- "dbg"
- "--spawn_strategy=standalone"
- "--noenable_bzlmod"
- "--enable_workspace"
ubuntu2004_examples:
name: Examples
platform: ubuntu2004
Expand All @@ -61,8 +65,10 @@ tasks:
test_targets: *linux_targets
build_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
test_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
ubuntu2004_examples_bzlmod:
name: Examples (bzlmod)
platform: ubuntu2004
Expand Down Expand Up @@ -107,13 +113,15 @@ tasks:
- "--spawn_strategy=standalone"
- "--noincompatible_enable_cc_toolchain_resolution"
- "--noenable_bzlmod"
- "--enable_workspace"
test_targets: *macos_targets_standalone
test_flags:
- "-c"
- "dbg"
- "--spawn_strategy=standalone"
- "--noincompatible_enable_cc_toolchain_resolution"
- "--noenable_bzlmod"
- "--enable_workspace"
macos_examples:
name: Examples
platform: macos
Expand All @@ -129,10 +137,12 @@ tasks:
build_flags:
- "--noincompatible_enable_cc_toolchain_resolution"
- "--noenable_bzlmod"
- "--enable_workspace"
test_targets: *macos_targets
test_flags:
- "--noincompatible_enable_cc_toolchain_resolution"
- "--noenable_bzlmod"
- "--enable_workspace"
windows_examples:
name: Examples
platform: windows
Expand All @@ -157,14 +167,17 @@ tasks:
- "-//cmake_hello_world_lib/static:libhello_example"
- "-//cmake_hello_world_lib/static:test_hello"
- "-//cmake_with_data/..."
- "-//rust/..."
batch_commands:
- powershell -noexit "& "".\..\.bazelci\windows-update-certs.ps1"""
build_targets: *windows_targets
test_targets: *windows_targets
build_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
test_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
rbe_ubuntu2004_flags:
name: Flags
platform: rbe_ubuntu2004
Expand Down Expand Up @@ -221,7 +234,7 @@ tasks:
- //...
min_supported_version:
name: "Minimum Supported Version"
bazel: "5.4.0"
bazel: "6.5.0"
skip_in_bazel_downstream_pipeline: "Duplicates tests in other targets"
platform: ubuntu1804
build_targets:
Expand All @@ -230,16 +243,19 @@ tasks:
- "//..."
min_supported_version_examples:
name: "Minimum Supported Version Examples"
bazel: "5.4.0"
bazel: "6.5.0"
skip_in_bazel_downstream_pipeline: "Duplicates tests in other targets"
platform: ubuntu1804
working_directory: examples
min_supported_targets: &min_supported_targets
- "--"
- "//..."
# The min supported version of rules_rust is `>=7`
- "-//rust/..."
build_targets: *min_supported_targets
test_targets: *min_supported_targets

buildifier:
version: "6.1.0"
version: "7.3.1"
# keep this argument in sync with .pre-commit-config.yaml
warnings: "all"
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.4.1
2 changes: 1 addition & 1 deletion .bcr/metadata.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "James Sharpe"
}
],
"repository": ["github:bazelbuild/rules_foreign_cc"],
"repository": ["github:bazel-contrib/rules_foreign_cc"],
"versions": [],
"yanked_versions": {}
}
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
BasedOnStyle: Google
IndentWidth: 4
...
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
*.bazel linguist-language=Starlark

# TODO: remove once https://github.com/github-linguist/linguist/pull/7121 lands
WORKSPACE.bzlmod linguist-language=Starlark

# .bazelrc are mostly a collection of the CLI arguments, so highlighting them
# as shell scripts looks quite alright and makes them quite readable
.bazelrc linguist-language=Shell
42 changes: 0 additions & 42 deletions .github/docs-0.1.0.patch

This file was deleted.

42 changes: 0 additions & 42 deletions .github/docs-0.2.0.patch

This file was deleted.

82 changes: 0 additions & 82 deletions .github/docs-0.3.0.patch

This file was deleted.

13 changes: 0 additions & 13 deletions .github/docs-0.4.0.patch

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Docs-CI/CD

on:
push:
branches:
- main

jobs:
docs:
name: Docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Run tests
run: bazel run --compilation_mode=opt --stamp //:publish_book
working-directory: docs
- name: Deploy to GitHub Pages
uses: JamesIves/[email protected]
with:
branch: docs # The branch the action should deploy to.
folder: docs/book # The folder the action should deploy.
34 changes: 34 additions & 0 deletions .github/workflows/formatting.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Formatting

on:
push:
branches:
- main
pull_request:
types:
- opened
- synchronize

jobs:
code-format-checks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: DoozyX/[email protected]
with:
source: '.'
extensions: 'h,c,cc,cpp,proto,java'
clangFormatVersion: 14
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.11
- name: Install dependencies
run: |
pip install 'black==24.10.0' 'isort==5.13.2'
- name: Run black
run: |
python -m black --check --diff ./
- name: Run isort
run: |
python -m isort --profile=black --check-only ./
Loading

0 comments on commit e3ea9ba

Please sign in to comment.