From 804926fb5bcead02a6f072e4d706183e36278a35 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 30 Jun 2019 19:45:33 -0700 Subject: [PATCH] Unconditionally skip athena builds for sim (#1748) They'll pretty much never work --- buildSrc/build.gradle | 2 +- shared/plugins/setupBuild.gradle | 1 + simulation/halsim_adx_gyro_accelerometer/build.gradle | 2 +- simulation/lowfi_simulation/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 2fc142ed31..7bd583ddd8 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -5,5 +5,5 @@ repositories { } } dependencies { - compile "edu.wpi.first:native-utils:2020.0.2" + compile "edu.wpi.first:native-utils:2020.0.3" } diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle index 1a0daa553a..e7b340c878 100644 --- a/shared/plugins/setupBuild.gradle +++ b/shared/plugins/setupBuild.gradle @@ -11,6 +11,7 @@ ext { apply from: "${rootDir}/shared/nilibraries.gradle" if (!project.hasProperty('onlylinuxathena')) { + ext.skiplinuxathena = true apply from: "${rootDir}/shared/config.gradle" model { diff --git a/simulation/halsim_adx_gyro_accelerometer/build.gradle b/simulation/halsim_adx_gyro_accelerometer/build.gradle index f73804d9a0..fac7d16605 100644 --- a/simulation/halsim_adx_gyro_accelerometer/build.gradle +++ b/simulation/halsim_adx_gyro_accelerometer/build.gradle @@ -12,7 +12,7 @@ ext { apply from: "${rootDir}/shared/config.gradle" if (!project.hasProperty('onlylinuxathena')) { - + ext.skiplinuxathena = true ext { sharedCvConfigs = [halsim_adx_gyro_accelerometerTest: []] staticCvConfigs = [:] diff --git a/simulation/lowfi_simulation/build.gradle b/simulation/lowfi_simulation/build.gradle index e42ea3bfa6..3665303862 100644 --- a/simulation/lowfi_simulation/build.gradle +++ b/simulation/lowfi_simulation/build.gradle @@ -13,7 +13,7 @@ ext { apply from: "${rootDir}/shared/config.gradle" if (!project.hasProperty('onlylinuxathena')) { - + ext.skiplinuxathena = true ext { sharedCvConfigs = [lowfi_simTest: []] staticCvConfigs = [:]