From 3c5cacf40416afdde1f2d3a2e54de72367c7626b Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 19 Jun 2024 05:12:20 -0400 Subject: [PATCH] [ci] Clean up workflows Remove unused steps/package installs relating to protobuf/generated files Bump webfactory/ssh-agent to 0.9.0 (Node 20) Switch to gradle/actions/wrapper-validation-action (Node 20) Bump wpilibsuite/import-signing-certificate to 1.2.0 Bump mozilla-actions/sccache-action to 0.0.5 (Node 20 for sanitizers only) --- .github/workflows/cmake.yml | 22 +++---------------- .github/workflows/documentation.yml | 2 +- .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/gradle.yml | 2 +- .github/workflows/sanitizers.yml | 11 ++-------- 5 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f85b73b2041..7eeae935700 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -28,27 +28,14 @@ jobs: steps: - name: Install dependencies (Linux) if: runner.os == 'Linux' - run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java python-is-python3 libprotobuf-dev protobuf-compiler ninja-build - - - name: Install QuickBuffers (Linux) - if: runner.os == 'Linux' - 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 + run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java libprotobuf-dev protobuf-compiler ninja-build - name: Install dependencies (macOS) run: brew install opencv protobuf@3 ninja if: runner.os == 'macOS' - - name: Set up Python 3.10 (macOS) - if: runner.os == 'macOS' - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Run sccache-cache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: Install jinja - run: python -m pip install jinja2 + uses: mozilla-actions/sccache-action@v0.0.5 - uses: actions/checkout@v4 @@ -77,10 +64,7 @@ jobs: uses: lukka/get-cmake@v3.29.3 - name: Run sccache-cache - uses: mozilla-actions/sccache-action@v0.0.4 - - - name: Install jinja - run: python -m pip install jinja2 + uses: mozilla-actions/sccache-action@v0.0.5 - uses: actions/checkout@v4 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 86eea417fbc..3ec5a1270b5 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -41,7 +41,7 @@ jobs: - name: Build with Gradle run: ./gradlew docs:generateJavaDocs docs:doxygen -PbuildServer ${{ env.EXTRA_GRADLE_ARGS }} - name: Install SSH Client 🔑 - uses: webfactory/ssh-agent@v0.8.0 + uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.GH_DEPLOY_KEY }} - name: Deploy 🚀 diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index b92b7c62dc8..df4f0fc62fd 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -11,4 +11,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/actions/wrapper-validation-action@v3 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4c37e8bfd6d..0bfc0a81365 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -112,7 +112,7 @@ jobs: java-version: 17 architecture: ${{ matrix.architecture }} - name: Import Developer ID Certificate - uses: wpilibsuite/import-signing-certificate@v1 + uses: wpilibsuite/import-signing-certificate@v1.2.0 with: certificate-data: ${{ secrets.APPLE_CERTIFICATE_DATA }} certificate-passphrase: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index cf4d1089f78..43ac294b119 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -29,17 +29,10 @@ jobs: container: wpilib/roborio-cross-ubuntu:2024-22.04 steps: - name: Install Dependencies - run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java python-is-python3 clang-14 libprotobuf-dev protobuf-compiler ninja-build - - - name: Install QuickBuffers - if: runner.os == 'Linux' - 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 + run: sudo apt-get update && sudo apt-get install -y libopencv-dev libopencv4.5-java clang-14 libprotobuf-dev protobuf-compiler ninja-build - name: Run sccache-cache - uses: mozilla-actions/sccache-action@v0.0.3 - - - name: Install jinja - run: python -m pip install jinja2 + uses: mozilla-actions/sccache-action@v0.0.5 - uses: actions/checkout@v4