Skip to content

Commit

Permalink
[ci] Clean up workflows
Browse files Browse the repository at this point in the history
Remove unused steps/package installs relating to protobuf/generated files
Remove unnecessary cd commands in upstream_utils
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)
  • Loading branch information
Gold856 committed Jun 19, 2024
1 parent e2893fc commit 528b1ba
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 61 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 🚀
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
40 changes: 10 additions & 30 deletions .github/workflows/upstream-utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,45 +35,25 @@ jobs:
cd upstream_utils
./update_eigen.py
- name: Run update_fmt.py
run: |
cd upstream_utils
./update_fmt.py
run: ./update_fmt.py
- name: Run update_gcem.py
run: |
cd upstream_utils
./update_gcem.py
run: ./update_gcem.py
- name: Run update_json.py
run: |
cd upstream_utils
./update_json.py
run: ./update_json.py
- name: Run update_libuv.py
run: |
cd upstream_utils
./update_libuv.py
run: ./update_libuv.py
- name: Run update_llvm.py
run: |
cd upstream_utils
./update_llvm.py
run: ./update_llvm.py
- name: Run update_mpack.py
run: |
cd upstream_utils
./update_mpack.py
run: ./update_mpack.py
- name: Run update_stack_walker.py
run: |
cd upstream_utils
./update_stack_walker.py
run: ./update_stack_walker.py
- name: Run update_memory.py
run: |
cd upstream_utils
./update_memory.py
run: ./update_memory.py
- name: Run update_protobuf.py
run: |
cd upstream_utils
./update_protobuf.py
run: ./update_protobuf.py
- name: Run update_sleipnir.py
run: |
cd upstream_utils
./update_sleipnir.py
run: ./update_sleipnir.py
- name: Add untracked files to index so they count as changes
run: git add -A
- name: Check output
Expand Down

0 comments on commit 528b1ba

Please sign in to comment.