Skip to content

Commit

Permalink
Merge branch 'master' into multiag-pnp
Browse files Browse the repository at this point in the history
  • Loading branch information
srimanachanta committed Sep 9, 2023
2 parents 0e4fa38 + f601275 commit 54a03b6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion photon-lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

wpilibTools.deps.wpilibVersion = wpilibVersion
println("Buidling for wpilib ${wpilibTools.deps.wpilibVersion}")
println("Building for WPILib ${wpilibTools.deps.wpilibVersion}")

// From wpilib shared/config.gradle:
// NativeUtils adds the following OpenCV warning suppression for Linux, but not
Expand Down
7 changes: 6 additions & 1 deletion photon-lib/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,16 @@ publishing {
username 'ghactions'
password System.getenv("ARTIFACTORY_API_KEY")
}
println("Publishing to " + url)
}
}
}

tasks.withType(PublishToMavenRepository) {
doFirst {
println("Publishing to " + repository.url);
}
}

task cleanReleaseRepo(type: Delete) {
delete releasesRepoUrl
}
Expand Down
7 changes: 6 additions & 1 deletion photon-targeting/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ publishing {
username 'ghactions'
password System.getenv("ARTIFACTORY_API_KEY")
}
println("Publishing PhotonTargeting to " + url)
}
}

Expand All @@ -25,3 +24,9 @@ publishing {
}
}
}

tasks.withType(PublishToMavenRepository) {
doFirst {
println("Publishing PhotonTargeting to " + repository.url)
}
}

0 comments on commit 54a03b6

Please sign in to comment.