Update Generation (#2)

* Regen

* Regen

* Update gen

* Gen stuff

Author: pjreiniger

.bazelrc

@@ -5,6 +5,12 @@ build:windows --copt=/std:c++20
 build:windows --copt=/Zc:preprocessor
 build:windows --copt=/wd5105
 
+# Windows Arm
+build:windows_arm --copt=/std:c++20
+build:windows_arm --copt=/Zc:preprocessor
+build:windows_arm --copt=/wd5105
+build:windows_arm --cpu=x64_arm64_windows
+
 # Linux
 build:linux --copt=-std=c++20
 build:linux --linkopt=-pthread
@@ -13,27 +19,31 @@ build:linux --linkopt=-pthread
 build:macos --copt=-std=c++20
 
 # Roborio
+build:roborio --incompatible_enable_cc_toolchain_resolution
 build:roborio --copt=-std=c++20
 build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio
 build:roborio --build_tag_filters=-no-roborio
 build:roborio --features=compiler_param_file
 build:roborio --platform_suffix=roborio
 
 # bullseye32
+build:bullseye32 --incompatible_enable_cc_toolchain_resolution
 build:bullseye32 --copt=-std=c++20
 build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32
 build:bullseye32 --build_tag_filters=-no-bullseye
 build:bullseye32 --features=compiler_param_file
 build:bullseye32 --platform_suffix=bullseye32
 
 # bullseye64
+build:bullseye64 --incompatible_enable_cc_toolchain_resolution
 build:bullseye64 --copt=-std=c++20
 build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
 build:bullseye64 --build_tag_filters=-no-bullseye
 build:bullseye64 --features=compiler_param_file
 build:bullseye64 --platform_suffix=bullseye64
 
 # rasppi
+build:raspi32 --incompatible_enable_cc_toolchain_resolution
 build:raspi32 --copt=-std=c++20
 build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
 build:raspi32 --build_tag_filters=-no-raspi
@@ -43,6 +53,5 @@ build:raspi32 --platform_suffix=raspi32
 # Global
 import .bazelrc-buildbuddy
 test --test_output=errors
-build --incompatible_enable_cc_toolchain_resolution
 build --java_language_version=11
 build --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/

.github/workflows/build.yml

@@ -12,21 +12,21 @@ 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: "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: "",                                 }
+        - { name: "windows - native",        os: windows-2019,   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: "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: "",                                 }
+        - { name: "windows - bzlmod native",     os: windows-2019,   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: "",                                 }
 
     name: "Build - ${{ matrix.name }}"
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
-    - run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} @rules_bzlmodrio_toolchains//...
+    - run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --config=remote @rules_bzlmodrio_toolchains//...
       working-directory: tests
     - run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --verbose_failures --config=remote //... || true
       working-directory: tests

.github/workflows/lint.yml

@@ -37,18 +37,18 @@ jobs:
     name: "buildifier"
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.15.x
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.20.x
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.15.x
+          go-version: 1.20.x
         id: go
 
       - uses: actions/checkout@v3
 
       - name: Install Buildifier
         run: |
           cd $(mktemp -d)
-          GO111MODULE=on go get github.com/bazelbuild/buildtools/buildifier@6.0.0
+          GO111MODULE=on go install github.com/bazelbuild/buildtools/buildifier@latest
 
       - name: Run buildifier
         run: buildifier -warnings all --lint=fix -r .

.github/workflows/publish.yml

@@ -53,6 +53,11 @@ jobs:
     - run: bazel run //:publish
       working-directory: rules/rules_bzlmodrio_toolchains/generate
 
+    - name: Store version
+      run: echo "NEW_VERSION=$(bazel run //:get_version)" >> $GITHUB_ENV
+      working-directory: libraries/rules_bzlmodrio_toolchains/generate
+
+
     # Create pull requests
     - name: Create Gentool Pull Request
       uses: peter-evans/create-pull-request@v4
@@ -64,7 +69,7 @@ jobs:
         token: ${{ secrets.AUTO_UPDATE_KEY }}
         reviewers: pjreiniger
         branch: autoupdate/rules_bzlmodrio_toolchains_update
-        title: "Auto-update latest rules_bzlmodrio_toolchains module release"
+        title: "Auto Update rules_bzlmodrio_toolchains module to '${{ env.NEW_VERSION }}'"
 
     - name: Create BCR Pull Request
       uses: peter-evans/create-pull-request@v4
@@ -76,4 +81,4 @@ jobs:
         token: ${{ secrets.AUTO_UPDATE_KEY }}
         reviewers: pjreiniger
         branch: autoupdate/rules_bzlmodrio_toolchains_update
-        title: "Auto-update latest rules_bzlmodrio_toolchains module release"
+        title: "Auto Update latest rules_bzlmodrio_toolchains to '${{ env.NEW_VERSION }}'"

generate/BUILD.bazel

@@ -26,3 +26,13 @@ py_binary(
         "@bzlmodrio-gentool//bazelrio_gentool",
     ],
 )
+
+py_binary(
+    name = "get_version",
+    srcs = ["get_version.py"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":get_toolchain_dependencies",
+        "@bzlmodrio-gentool//bazelrio_gentool",
+    ],
+)

generate/get_version.py

@@ -0,0 +1,10 @@
+from get_toolchain_dependencies import get_toolchain_dependencies
+
+
+def main():
+    toolchain = get_toolchain_dependencies()
+    print(toolchain.version)
+
+
+if __name__ == "__main__":
+    main()

tests/.bazelrc

@@ -5,6 +5,12 @@ build:windows --copt=/std:c++20
 build:windows --copt=/Zc:preprocessor
 build:windows --copt=/wd5105
 
+# Windows Arm
+build:windows_arm --copt=/std:c++20
+build:windows_arm --copt=/Zc:preprocessor
+build:windows_arm --copt=/wd5105
+build:windows_arm --cpu=x64_arm64_windows
+
 # Linux
 build:linux --copt=-std=c++20
 build:linux --linkopt=-pthread
@@ -13,27 +19,31 @@ build:linux --linkopt=-pthread
 build:macos --copt=-std=c++20
 
 # Roborio
+build:roborio --incompatible_enable_cc_toolchain_resolution
 build:roborio --copt=-std=c++20
 build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio
 build:roborio --build_tag_filters=-no-roborio
 build:roborio --features=compiler_param_file
 build:roborio --platform_suffix=roborio
 
 # bullseye32
+build:bullseye32 --incompatible_enable_cc_toolchain_resolution
 build:bullseye32 --copt=-std=c++20
 build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32
 build:bullseye32 --build_tag_filters=-no-bullseye
 build:bullseye32 --features=compiler_param_file
 build:bullseye32 --platform_suffix=bullseye32
 
 # bullseye64
+build:bullseye64 --incompatible_enable_cc_toolchain_resolution
 build:bullseye64 --copt=-std=c++20
 build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
 build:bullseye64 --build_tag_filters=-no-bullseye
 build:bullseye64 --features=compiler_param_file
 build:bullseye64 --platform_suffix=bullseye64
 
 # rasppi
+build:raspi32 --incompatible_enable_cc_toolchain_resolution
 build:raspi32 --copt=-std=c++20
 build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
 build:raspi32 --build_tag_filters=-no-raspi
@@ -43,6 +53,5 @@ build:raspi32 --platform_suffix=raspi32
 # Global
 import .bazelrc-buildbuddy
 test --test_output=errors
-build --incompatible_enable_cc_toolchain_resolution
 build --java_language_version=11
 build --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/