From 35a1c52788b93c7807c5e39bf24f4ae05b4f05e2 Mon Sep 17 00:00:00 2001 From: Isaac Turner Date: Thu, 21 Dec 2023 12:30:45 +0800 Subject: [PATCH] [build] Upgrade quickbuf to 1.3.3 (#6072) --- .github/workflows/cmake.yml | 2 +- .github/workflows/pregenerate.yml | 4 ++-- .github/workflows/sanitizers.yml | 2 +- wpimath/build.gradle | 2 +- wpiutil/CMakeLists.txt | 6 +++--- wpiutil/build.gradle | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e0ff5a970a..a101b4a423 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -32,7 +32,7 @@ jobs: - name: Install QuickBuffers (Linux) if: runner.os == 'Linux' - run: wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.2/protoc-gen-quickbuf_1.3.2_amd64.deb && sudo apt install ./protoc-gen-quickbuf_1.3.2_amd64.deb + run: wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.3/protoc-gen-quickbuf_1.3.3_amd64.deb && sudo apt install ./protoc-gen-quickbuf_1.3.3_amd64.deb - name: Install opencv (macOS) run: brew install opencv protobuf@3 ninja diff --git a/.github/workflows/pregenerate.yml b/.github/workflows/pregenerate.yml index b730264c4c..6b84fb0fa7 100644 --- a/.github/workflows/pregenerate.yml +++ b/.github/workflows/pregenerate.yml @@ -28,13 +28,13 @@ jobs: - name: Install jinja run: python -m pip install jinja2 - name: Install protobuf dependencies - run: sudo apt-get update && sudo apt-get install -y protobuf-compiler && wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.2/protoc-gen-quickbuf-1.3.2-linux-x86_64.exe && chmod +x protoc-gen-quickbuf-1.3.2-linux-x86_64.exe + run: sudo apt-get update && sudo apt-get install -y protobuf-compiler && wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.3/protoc-gen-quickbuf-1.3.3-linux-x86_64.exe && chmod +x protoc-gen-quickbuf-1.3.3-linux-x86_64.exe - name: Run hal run: ./hal/generate_usage_reporting.py - name: Run ntcore run: ./ntcore/generate_topics.py - name: Run wpimath - run: ./wpimath/generate_numbers.py && ./wpimath/generate_quickbuf.py protoc protoc-gen-quickbuf-1.3.2-linux-x86_64.exe + run: ./wpimath/generate_numbers.py && ./wpimath/generate_quickbuf.py protoc protoc-gen-quickbuf-1.3.3-linux-x86_64.exe - name: Add untracked files to index so they count as changes run: git add -A - name: Check output diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index faa9faddc2..cf4d1089f7 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -33,7 +33,7 @@ jobs: - name: Install QuickBuffers if: runner.os == 'Linux' - run: wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.2/protoc-gen-quickbuf_1.3.2_amd64.deb && sudo apt install ./protoc-gen-quickbuf_1.3.2_amd64.deb + run: wget https://github.com/HebiRobotics/QuickBuffers/releases/download/1.3.3/protoc-gen-quickbuf_1.3.3_amd64.deb && sudo apt install ./protoc-gen-quickbuf_1.3.3_amd64.deb - name: Run sccache-cache uses: mozilla-actions/sccache-action@v0.0.3 diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 064b8e5bdc..e16e5e7202 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -69,7 +69,7 @@ dependencies { api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" api "com.fasterxml.jackson.core:jackson-core:2.15.2" api "com.fasterxml.jackson.core:jackson-databind:2.15.2" - api "us.hebi.quickbuf:quickbuf-runtime:1.3.2" + api "us.hebi.quickbuf:quickbuf-runtime:1.3.3" } sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java" diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index 083829e124..a3f6f1935b 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -40,15 +40,15 @@ if(WITH_JAVA) file(GLOB JACKSON_JARS ${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/*.jar) - if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/quickbuf-runtime-1.3.2.jar") + if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/quickbuf-runtime-1.3.3.jar") set(BASE_URL "https://search.maven.org/remotecontent?filepath=") set(JAR_ROOT "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf") message(STATUS "Downloading Quickbuf jarfile...") file( DOWNLOAD - "${BASE_URL}us/hebi/quickbuf/quickbuf-runtime/1.3.2/quickbuf-runtime-1.3.2.jar" - "${JAR_ROOT}/quickbuf-runtime-1.3.2.jar" + "${BASE_URL}us/hebi/quickbuf/quickbuf-runtime/1.3.3/quickbuf-runtime-1.3.3.jar" + "${JAR_ROOT}/quickbuf-runtime-1.3.3.jar" ) message(STATUS "Downloaded.") diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index e456a19777..7e4cc16990 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -285,7 +285,7 @@ dependencies { api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" api "com.fasterxml.jackson.core:jackson-core:2.15.2" api "com.fasterxml.jackson.core:jackson-databind:2.15.2" - api 'us.hebi.quickbuf:quickbuf-runtime:1.3.2' + api 'us.hebi.quickbuf:quickbuf-runtime:1.3.3' printlogImplementation sourceSets.main.output }