Skip to content

Commit

Permalink
replace deprecated action; reduce test matrix for network stability
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-manes committed Nov 6, 2022
1 parent b49fce9 commit 6800aa6
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 23 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Expand Up @@ -71,7 +71,6 @@ jobs:
runs-on: ubuntu-latest
needs: compile
strategy:
fail-fast: false
matrix:
suite:
- caffeine:weakKeysAndStrongValuesStatsAsyncCaffeineSlowTest
Expand Down Expand Up @@ -130,7 +129,7 @@ jobs:
- simulator:check
- jcache:check
- guava:check
java: [ 11, 19, 20, GraalVM ]
java: [ 19 ]
env:
JAVA_VERSION: ${{ matrix.java }}
steps:
Expand All @@ -157,9 +156,8 @@ jobs:
- name: Compress test results
if: always() && (matrix.java == env.MAX_JVM)
run: >
find . -name *.exec -o -name *.xml |
grep "jacoco\|results" |
tar czf ${{ env.ARTIFACT_NAME }}.tar.gz --files-from -
find . -path */jacoco/*.exec -o -path */results/*.xml
| tar czf ${{ env.ARTIFACT_NAME }}.tar.gz --files-from -
- name: Upload test results
uses: actions/upload-artifact@v3
if: always() && (matrix.java == env.MAX_JVM)
Expand Down Expand Up @@ -273,14 +271,16 @@ jobs:
STATUS: ${{ fromJSON(steps.test-results.outputs.json).formatted.stats.runs }}
run: curl -s https://badgen.net/badge/${{env.LABEL}}/${{env.STATUS}}/${{env.COLOR}} > badge.svg
- name: Upload badge to Gist
uses: andymckay/append-gist-action@88823092589111fc0683e670da60e941b29f94e9
uses: popsiclestick/gist-sync-action@v1.2.0
if: >
github.event_name == 'push'
&& endsWith(github.ref, github.event.repository.default_branch)
with:
gistURL: https://gist.githubusercontent.com/ben-manes/c20eb418f0e0bd6dfe1c25beb35faae4
token: ${{ secrets.GIST_TOKEN }}
file: badge.svg
gist_url: https://gist.githubusercontent.com/ben-manes/c20eb418f0e0bd6dfe1c25beb35faae4
auth: ${{ secrets.GIST_TOKEN }}
gist_description: Test Results
gist_title: Test Results
github_file: badge.svg

publish-snapshot:
name: Publish Snapshot
Expand Down
12 changes: 1 addition & 11 deletions build.gradle
@@ -1,5 +1,3 @@
import net.ltgt.gradle.errorprone.CheckSeverity

apply plugin: 'io.github.gradle-nexus.publish-plugin'
apply plugin: 'io.snyk.gradle.plugin.snykplugin'
apply plugin: 'org.kordamp.gradle.source-stats'
Expand All @@ -12,8 +10,8 @@ buildscript {
apply from: "${rootDir}/gradle/dependencies.gradle"

repositories {
mavenCentral()
gradlePluginPortal()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -92,14 +90,6 @@ subprojects {
sourceSet = sourceSets.main
}

tasks.withType(JavaCompile).configureEach {
if (name.contains('Test') || name.contains('Jmh')) {
options.errorprone.nullaway {
severity = CheckSeverity.OFF
}
}
}

if (project != project(':caffeine')) {
javadoc.options.linksOffline(
"https://static.javadoc.io/${group}/caffeine/${version}/",
Expand Down
3 changes: 3 additions & 0 deletions gradle/codeQuality.gradle
Expand Up @@ -161,6 +161,9 @@ tasks.withType(JavaCompile).configureEach {
errorChecks.each { error(it) }

nullaway {
if (name.contains('Test') || name.contains('Jmh')) {
disable()
}
annotatedPackages.add('com.github.benmanes.caffeine')
annotatedPackages.add('com.google.common')
checkOptionalEmptiness = true
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Expand Up @@ -101,7 +101,7 @@ ext {
jmh: '0.6.8',
jmhReport: '0.9.0',
nexusPublish: '1.1.0',
nullaway: '1.4.0',
nullaway: '1.5.0',
pmd: '6.51.0',
semanticVersioning: '1.1.0',
snyke: '0.4',
Expand Down
3 changes: 1 addition & 2 deletions simulator/build.gradle
@@ -1,6 +1,5 @@
/** Cache simulator using tracing data and a family of eviction policy options. */
import org.gradle.plugins.ide.eclipse.model.SourceFolder
import net.ltgt.gradle.errorprone.CheckSeverity

apply plugin:'application'

Expand Down Expand Up @@ -66,8 +65,8 @@ tasks.named('sourcesJar').configure {

tasks.withType(JavaCompile).configureEach {
options.errorprone {
nullaway.severity = CheckSeverity.OFF
disable('CanIgnoreReturnValueSuggester')
nullaway.disable()
}
}

Expand Down

0 comments on commit 6800aa6

Please sign in to comment.