Auto generation updates (#3)

pjreiniger · web-flow · commit 73e8bd3d64fa · 2023-10-16T11:46:28.000-04:00
* Update versions

* Version update

* Update gen

* Update versions

* Update deprecation flags

* Update autogen

* Update autogen

* Update autogen

* Gen stuff

* Gen stuff

* Add auto update ability

* lint
diff --git a/.bazelrc b/.bazelrc
@@ -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
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.2.1
+6.3.2
diff --git a/.github/workflows/auto_update.yml b/.github/workflows/auto_update.yml
@@ -0,0 +1,85 @@
+name: Auto Update
+on:
+  workflow_dispatch:
+  schedule:
+    # Check on Mondays and Thursdays
+    - cron:  '0 0 * * 1,4'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  auto_update_module:
+    name: "Auto Update Module"
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.20.x
+      uses: actions/setup-go@v4
+      with:
+        go-version: 1.20.x
+      id: go
+
+    - uses: actions/checkout@v3
+
+    - name: Install Buildifier
+      run: |
+        cd $(mktemp -d)
+        GO111MODULE=on go install github.com/bazelbuild/buildtools/buildifier@latest
+
+    # Checkout repository
+    - uses: actions/checkout@v3
+      with:
+        path: libraries/rules_bzlmodrio_toolchains
+
+    # Checkout gentool
+    - uses: actions/checkout@v3
+      with:
+        repository: 'bzlmodRio/gentool.git'
+        fetch-depth: 0
+        path: gentool
+        ref: refactor_dev
+
+
+    - name: Setup Cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/bzlmod_cache/*.sha256
+        key: ${{ runner.os }}-${{ hashFiles('**/generate/**') }}
+        restore-keys: |
+          ${{ runner.os }}-
+          ${{ runner.os }}
+
+    # Run update
+    - name: Run update
+      run: bazel run //:auto_update
+      working-directory: libraries/rules_bzlmodrio_toolchains/generate
+
+    - name: Generate if changed
+      run: |
+        if [[ $(git --no-pager diff --exit-code HEAD) != '' ]]; then
+          echo "Something changed, need to re-generate"
+          bazel run //:generate
+          buildifier -warnings all --lint=fix -r ..
+        else
+          echo "No changes!"
+        fi;
+      working-directory: libraries/rules_bzlmodrio_toolchains/generate
+
+    - name: Store new version
+      run: echo "NEW_VERSION=$(bazel run //:get_version)" >> $GITHUB_ENV
+      working-directory: libraries/rules_bzlmodrio_toolchains/generate
+
+    # Create pull requests
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v4
+      env:
+        GITHUB_TOKEN: ${{ secrets.AUTO_UPDATE_KEY }}
+      with:
+        path: libraries/rules_bzlmodrio_toolchains
+        base: main
+        token: ${{ secrets.AUTO_UPDATE_KEY }}
+        reviewers: pjreiniger
+        branch: autoupdate_${{ env.NEW_VERSION }}
+        title: "Auto Update to '${{ env.NEW_VERSION }}'"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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: "",                                 }
 
@@ -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 @rules_bzlmodrio_toolchains//...
       working-directory: tests
     - run: bazel ${{ matrix.bazel_options }} build -k ${{ matrix.config }} --verbose_failures --config=remote //... || true
@@ -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
@@ -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
@@ -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
@@ -118,12 +122,12 @@ jobs:
       matrix:
         include:
         # Build standard, bullseye32:
-        - { name: "windows - raspi32",         os: windows-2019,   command: "build", config: "--config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "windows - raspi32",         os: windows-2022,   command: "build", config: "--config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - raspi32",         os: ubuntu-latest,  command: "build", config: "--config=raspi32", bazel_options: "",                                 }
         - { name: "macos   - raspi32",         os: macos-latest,   command: "build", config: "--config=raspi32", bazel_options: "",                                 }
 
         # Build bzlmod, bullseye32:
-        - { name: "windows - bzlmod raspi32",  os: windows-2019,   command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
+        - { name: "windows - bzlmod raspi32",  os: windows-2022,   command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
         - { name: "ubuntu  - bzlmod raspi32",  os: ubuntu-latest,  command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "",                                 }
         - { name: "macos   - bzlmod raspi32",  os: macos-latest,   command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "",                                 }
     name: "Build - ${{ matrix.name }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -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"
@@ -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 -
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -68,7 +68,7 @@ jobs:
         base: refactor_dev
         token: ${{ secrets.AUTO_UPDATE_KEY }}
         reviewers: pjreiniger
-        branch: autoupdate/rules_bzlmodrio_toolchains_update
+        branch: autoupdate/rules_bzlmodrio_toolchains_update_${{ env.NEW_VERSION }}
         title: "Auto Update rules_bzlmodrio_toolchains module to '${{ env.NEW_VERSION }}'"
 
     - name: Create BCR Pull Request
@@ -80,5 +80,5 @@ jobs:
         base: bzlmodrio
         token: ${{ secrets.AUTO_UPDATE_KEY }}
         reviewers: pjreiniger
-        branch: autoupdate/rules_bzlmodrio_toolchains_update
+        branch: autoupdate/rules_bzlmodrio_toolchains_update_${{ env.NEW_VERSION }}
         title: "Auto Update latest rules_bzlmodrio_toolchains to '${{ env.NEW_VERSION }}'"
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -4,8 +4,8 @@ module(
     compatibility_level = 2023,
 )
 
-bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "rules_cc", version = "0.0.6")
+bazel_dep(name = "platforms", version = "0.0.7")
+bazel_dep(name = "rules_cc", version = "0.0.8")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
 
 deps = use_extension("//:maven_deps.bzl", "deps")
diff --git a/generate/auto_update.py b/generate/auto_update.py
@@ -0,0 +1,32 @@
+import os
+import re
+from bazelrio_gentool.auto_update_utils import get_latest_tag, split_tag
+
+
+def main():
+    latest_tag = get_latest_tag("wpilibsuite", "opensdk")
+
+    overall_year, overall_version = latest_tag[1:].split("-")
+
+    SCRIPT_DIR = os.environ["BUILD_WORKSPACE_DIRECTORY"]
+
+    file_to_replace = os.path.join(SCRIPT_DIR, "get_toolchain_dependencies.py")
+
+    with open(file_to_replace, "r") as f:
+        contents = f.read()
+
+    contents = re.sub(
+        '( +)overall_year = "(.*)"', f'\\1overall_year = "{overall_year}"', contents
+    )
+    contents = re.sub(
+        '( +)overall_version = f?"(.*)"',
+        f'\\1overall_version = "{overall_version}"',
+        contents,
+    )
+
+    with open(file_to_replace, "w") as f:
+        f.write(contents)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -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
diff --git a/tests/.bazelversion b/tests/.bazelversion
@@ -1 +1 @@
-6.2.1
+6.3.2
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -4,5 +4,5 @@ local_path_override(
     path = "..",
 )
 
-bazel_dep(name = "googletest", version = "1.12.1")
-bazel_dep(name = "rules_cc", version = "0.0.6")
+bazel_dep(name = "googletest", version = "1.14.0")
+bazel_dep(name = "rules_cc", version = "0.0.8")
diff --git a/tests/WORKSPACE b/tests/WORKSPACE

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ module(`
`4`	`4`	`compatibility_level = 2023,`
`5`	`5`	`)`
`6`	`6`
`7`		`-bazel_dep(name = "platforms", version = "0.0.6")`
`8`		`-bazel_dep(name = "rules_cc", version = "0.0.6")`
	`7`	`+bazel_dep(name = "platforms", version = "0.0.7")`
	`8`	`+bazel_dep(name = "rules_cc", version = "0.0.8")`
`9`	`9`	`bazel_dep(name = "bazel_skylib", version = "1.4.2")`
`10`	`10`
`11`	`11`	`deps = use_extension("//:maven_deps.bzl", "deps")`