Skip to content

Commit

Permalink
Run regeneration (#4)
Browse files Browse the repository at this point in the history
* Update versions

* Version update

* Update gen

* Update versions

* Update deprecation flags

* Update autogen

* Update autogen

* Update autogen

* Gen stuff

* Gen stuff
  • Loading branch information
pjreiniger authored Sep 4, 2023
1 parent 1ced677 commit 5df8113
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 34 deletions.
23 changes: 23 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
try-import user.bazelrc

# build --javacopt=-Werror
build --javacopt=-Xlint:all,-serial,-processing,-options

# Windows
build:windows --copt=/W3
build:windows --copt=/WX
build:windows --copt=/std:c++20
build:windows --copt=/Zc:preprocessor
build:windows --copt=/wd5105
build:windows --cxxopt=/wd4267
build:windows --cxxopt=/wd4244

# Windows Arm
build:windows_arm --copt=/W3
build:windows_arm --copt=/WX
build:windows_arm --copt=/std:c++20
build:windows_arm --copt=/Zc:preprocessor
build:windows_arm --copt=/wd5105
build:windows_arm --cxxopt=/wd4267
build:windows_arm --cxxopt=/wd4244
build:windows_arm --cpu=x64_arm64_windows

# Linux
build:linux --copt=-Wall
build:linux --copt=-Wextra
build:linux --copt=-Werror
build:linux --copt=-std=c++20
build:linux --linkopt=-pthread

# MacOS
build:macos --copt=-Wall
build:macos --copt=-Wextra
build:macos --copt=-Werror
build:macos --copt=-std=c++20
build:macos --cxxopt=-Wno-unused-parameter
build:macos --cxxopt=-Wno-error=deprecated-declarations
build:macos --cxxopt=-Wno-error=deprecated-enum-enum-conversion
build:macos --cxxopt=-Wno-error=deprecated-anon-enum-enum-conversion
build:macos --cxxopt=-Wno-error=inconsistent-missing-override
build:macos --cxxopt=-Wno-error=overloaded-virtual

# Roborio
build:roborio --incompatible_enable_cc_toolchain_resolution
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.2.1
6.3.2
2 changes: 1 addition & 1 deletion .github/workflows/auto_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ jobs:
base: main
token: ${{ secrets.AUTO_UPDATE_KEY }}
reviewers: pjreiniger
branch: autoupdate
branch: autoupdate_${{ env.NEW_VERSION }}
title: "Auto Update to '${{ env.NEW_VERSION }}'"
20 changes: 12 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
matrix:
include:
# Build standard, native
- { name: "windows - native", os: windows-2019, command: "test", config: "--config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - native", os: windows-2022, command: "test", config: "--config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - native", os: ubuntu-latest, command: "test", config: "--config=linux", bazel_options: "", }
- { name: "macos - native", os: macos-latest, command: "test", config: "--config=macos", bazel_options: "", }

# Build bzlmod, native
- { name: "windows - bzlmod native", os: windows-2019, command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - bzlmod native", os: windows-2022, command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bzlmod native", os: ubuntu-latest, command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
- { name: "macos - bzlmod native", os: macos-latest, command: "test", config: "--enable_bzlmod --config=macos", bazel_options: "", }

Expand All @@ -26,6 +26,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with: { python-version: '3.10.8' }
- run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --config=remote @bzlmodrio-ni//...
working-directory: tests
- run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --verbose_failures --config=remote //... || true
Expand All @@ -40,19 +41,20 @@ jobs:
matrix:
include:
# Build standard, roborio
- { name: "windows - roborio", os: windows-2019, command: "build", config: "--config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - roborio", os: windows-2022, command: "build", config: "--config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - roborio", os: ubuntu-latest, command: "build", config: "--config=roborio", bazel_options: "", }
- { name: "macos - roborio", os: macos-latest, command: "build", config: "--config=roborio", bazel_options: "", }

# Build bzlmod, roborio
# - { name: "windows - bzlmod roborio", os: windows-2019, command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
# - { name: "windows - bzlmod roborio", os: windows-2022, command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bzlmod roborio", os: ubuntu-latest, command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
- { name: "macos - bzlmod roborio", os: macos-latest, command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
name: "Build - ${{ matrix.name }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with: { python-version: '3.10.8' }
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=remote || true
working-directory: tests
Expand All @@ -65,19 +67,20 @@ jobs:
matrix:
include:
# Build standard, bullseye32
- { name: "windows - bullseye32", os: windows-2019, command: "build", config: "--config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - bullseye32", os: windows-2022, command: "build", config: "--config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bullseye32", os: ubuntu-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }
- { name: "macos - bullseye32", os: macos-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }

# Build bzlmod, bullseye32
- { name: "windows - bzlmod bullseye32", os: windows-2019, command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - bzlmod bullseye32", os: windows-2022, command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bzlmod bullseye32", os: ubuntu-latest, command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", }
- { name: "macos - bzlmod bullseye32", os: macos-latest, command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", }
name: "Build - ${{ matrix.name }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with: { python-version: '3.10.8' }
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=remote || true
working-directory: tests
Expand All @@ -91,19 +94,20 @@ jobs:
matrix:
include:
# Build standard, bullseye32:
- { name: "windows - bullseye64", os: windows-2019, command: "build", config: "--config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - bullseye64", os: windows-2022, command: "build", config: "--config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bullseye64", os: ubuntu-latest, command: "build", config: "--config=bullseye64", bazel_options: "", }
- { name: "macos - bullseye64", os: macos-latest, command: "build", config: "--config=bullseye32", bazel_options: "", }

# Build bzlmod, bullseye32:
- { name: "windows - bzlmod bullseye64", os: windows-2019, command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "windows - bzlmod bullseye64", os: windows-2022, command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
- { name: "ubuntu - bzlmod bullseye64", os: ubuntu-latest, command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", }
- { name: "macos - bzlmod bullseye64", os: macos-latest, command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", }
name: "Build - ${{ matrix.name }}"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with: { python-version: '3.10.8' }
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=remote || true
working-directory: tests
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
lint_python:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: psf/black@stable
wpiformat:
name: "wpiformat"
Expand All @@ -18,9 +18,8 @@ jobs:
git fetch origin main
git branch -f main origin/main
if: github.ref != 'refs/heads/main'
- uses: actions/setup-python@v2
with:
python-version: '3.10.8'
- uses: actions/setup-python@v4
with: { python-version: '3.10.8' }
- name: Install clang-format
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
base: refactor_dev
token: ${{ secrets.AUTO_UPDATE_KEY }}
reviewers: pjreiniger
branch: autoupdate/bzlmodrio-ni_update
branch: autoupdate/bzlmodrio-ni_update_${{ env.NEW_VERSION }}
title: "Auto Update bzlmodrio-ni module to '${{ env.NEW_VERSION }}'"

- name: Create BCR Pull Request
Expand All @@ -80,5 +80,5 @@ jobs:
base: bzlmodrio
token: ${{ secrets.AUTO_UPDATE_KEY }}
reviewers: pjreiniger
branch: autoupdate/bzlmodrio-ni_update
branch: autoupdate/bzlmodrio-ni_update_${{ env.NEW_VERSION }}
title: "Auto Update latest bzlmodrio-ni to '${{ env.NEW_VERSION }}'"
2 changes: 2 additions & 0 deletions .styleguide
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ generatedFileExclude {
bazel-testlogs/
bazel-tests
BUILD.bazel
\.jinja2$
generate/vendor_dep.json$
}

repoRootNameOverride {
Expand Down
8 changes: 4 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module(
compatibility_level = 2023,
)

bazel_dep(name = "platforms", version = "0.0.6")
bazel_dep(name = "rules_cc", version = "0.0.6")
bazel_dep(name = "rules_java", version = "6.0.0")
bazel_dep(name = "rules_bazelrio", version = "0.0.12")
bazel_dep(name = "platforms", version = "0.0.7")
bazel_dep(name = "rules_cc", version = "0.0.8")
bazel_dep(name = "rules_java", version = "6.4.0")
bazel_dep(name = "rules_bazelrio", version = "0.0.13")
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")

setup_bzlmodrio_ni_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_ni_cpp_dependencies")
Expand Down
10 changes: 5 additions & 5 deletions private/non_bzlmod_dependencies/download_dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ def download_dependencies():
# JVM External
http_archive(
name = "rules_jvm_external",
sha256 = "f86fd42a809e1871ca0aabe89db0d440451219c3ce46c58da240c7dcdc00125f",
strip_prefix = "rules_jvm_external-5.2",
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.2/rules_jvm_external-5.2.tar.gz",
sha256 = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
strip_prefix = "rules_jvm_external-5.3",
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.3/rules_jvm_external-5.3.tar.gz",
)

# Bazelrio Rules
http_archive(
name = "rules_bazelrio",
sha256 = "0caf6c4da67b08abbb8cc619729928fa0516a0d5ce01adf4141d1dd378466bc6",
url = "https://github.com/bzlmodRio/rules_bazelrio/releases/download/0.0.12/rules_bazelrio-0.0.12.tar.gz",
sha256 = "b439b1fa3ead015d8fb20f804e65fc877d28d39d337b963db011119c6c7a23a5",
url = "https://github.com/bzlmodRio/rules_bazelrio/releases/download/0.0.13/rules_bazelrio-0.0.13.tar.gz",
)

# Roborio Toolchain
Expand Down
23 changes: 23 additions & 0 deletions tests/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
try-import user.bazelrc

# build --javacopt=-Werror
build --javacopt=-Xlint:all,-serial,-processing,-options

# Windows
build:windows --copt=/W3
build:windows --copt=/WX
build:windows --copt=/std:c++20
build:windows --copt=/Zc:preprocessor
build:windows --copt=/wd5105
build:windows --cxxopt=/wd4267
build:windows --cxxopt=/wd4244

# Windows Arm
build:windows_arm --copt=/W3
build:windows_arm --copt=/WX
build:windows_arm --copt=/std:c++20
build:windows_arm --copt=/Zc:preprocessor
build:windows_arm --copt=/wd5105
build:windows_arm --cxxopt=/wd4267
build:windows_arm --cxxopt=/wd4244
build:windows_arm --cpu=x64_arm64_windows

# Linux
build:linux --copt=-Wall
build:linux --copt=-Wextra
build:linux --copt=-Werror
build:linux --copt=-std=c++20
build:linux --linkopt=-pthread

# MacOS
build:macos --copt=-Wall
build:macos --copt=-Wextra
build:macos --copt=-Werror
build:macos --copt=-std=c++20
build:macos --cxxopt=-Wno-unused-parameter
build:macos --cxxopt=-Wno-error=deprecated-declarations
build:macos --cxxopt=-Wno-error=deprecated-enum-enum-conversion
build:macos --cxxopt=-Wno-error=deprecated-anon-enum-enum-conversion
build:macos --cxxopt=-Wno-error=inconsistent-missing-override
build:macos --cxxopt=-Wno-error=overloaded-virtual

# Roborio
build:roborio --incompatible_enable_cc_toolchain_resolution
Expand Down
2 changes: 1 addition & 1 deletion tests/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.2.1
6.3.2
10 changes: 5 additions & 5 deletions tests/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ local_path_override(
path = "..",
)

bazel_dep(name = "googletest", version = "1.12.1")
bazel_dep(name = "rules_cc", version = "0.0.6")
bazel_dep(name = "rules_java", version = "6.0.0")
bazel_dep(name = "rules_jvm_external", version = "5.2")
bazel_dep(name = "rules_bazelrio", version = "0.0.12")
bazel_dep(name = "googletest", version = "1.14.0")
bazel_dep(name = "rules_cc", version = "0.0.8")
bazel_dep(name = "rules_java", version = "6.4.0")
bazel_dep(name = "rules_jvm_external", version = "5.3")
bazel_dep(name = "rules_bazelrio", version = "0.0.13")
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
bazel_dep(name = "rules_pmd", version = "6.43.0")
bazel_dep(name = "rules_checkstyle", version = "10.1")
Expand Down
6 changes: 3 additions & 3 deletions tests/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ local_repository(
# Google Test
http_archive(
name = "googletest",
sha256 = "24564e3b712d3eb30ac9a85d92f7d720f60cc0173730ac166f27dda7fed76cb2",
strip_prefix = "googletest-release-1.12.1",
urls = ["https://github.com/google/googletest/archive/release-1.12.1.zip"],
sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
strip_prefix = "googletest-1.14.0",
urls = ["https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz"],
)

load("@bzlmodrio-ni//private/non_bzlmod_dependencies:download_dependencies.bzl", "download_dependencies")
Expand Down

0 comments on commit 5df8113

Please sign in to comment.