Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Team846/howler_monkey
Browse files Browse the repository at this point in the history
  • Loading branch information
VyaasBaskar committed Sep 11, 2024
2 parents ac72dc6 + 66ecb48 commit 4ec3d25
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
28 changes: 21 additions & 7 deletions .github/workflows/verify_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "**"

jobs:
build:
verify_functional:
runs-on: ubuntu-latest
container: wpilib/roborio-cross-ubuntu:2024-22.04

Expand All @@ -23,9 +23,6 @@ jobs:
echo "pcre-8.45" > cache-directory-2.txt
echo "cppcheck-2.12.1" >> cache-directory-2.txt
- name: Install clang-format
run: run: sudo apt-get update && sudo apt-get install -y clang-format

- name: Cache PCRE and CppCheck
id: cache-deps
uses: actions/cache@v3
Expand Down Expand Up @@ -74,7 +71,24 @@ jobs:
run: ./gradlew installRoborioToolchain

- name: Compile code and run tests
run: ./gradlew build
run: ./gradlew build -PfromCI

verify_format:
runs-on: ubuntu-latest
container: wpilib/roborio-cross-ubuntu:2024-22.04

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install clang-format
run: sudo apt-get update && sudo apt-get install -y clang-format

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Install Roborio Toolchain
run: ./gradlew installRoborioToolchain

- name: Spotless Check
run: ./gradlew spotlessCheck
# - name: Spotless Check
# run: ./gradlew spotlessCheck -PfromCI
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ spotless {
include '**/*.cpp', '**/*.cc', '**/*.h', '**/*.hpp'
exclude '**/build/**', '**/build-*/**'
}

clangFormat('18.1.8').style('Google')
def selectedClangVersion = project.hasProperty('fromCI') ? '14.0.0-1ubuntu1.1' : '18.1.8'
clangFormat(selectedClangVersion).style('Google')
}
groovyGradle {
target fileTree('.') {
target fileTree('src') {
include '**/*.gradle'
exclude '**/build/**', '**/build-*/**'
}
Expand Down

0 comments on commit 4ec3d25

Please sign in to comment.