Skip to content

Commit

Permalink
feat($GitHub): use Gradle compilation for GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnymillergh committed Jul 31, 2022
1 parent 937f82b commit 053eb8b
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 628 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ jobs:
DOCKER_HUB_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
steps:
- uses: actions/checkout@v2
- name: Set up Java
- name: Setup Java
uses: actions/setup-java@v3.1.0
with:
java-version: ${{env.TERMURIN_VERSION}}
distribution: 'temurin'
- name: Grant Execution Permission for `mvnw`
run: chmod +x mvnw
- name: Build with Maven
run: ./mvnw --threads 2C --show-version -Djunit.jupiter.execution.parallel.enabled=true -Dmaven.javadoc.skip=true -Djib.to.auth.username=$DOCKER_HUB_USERNAME -Djib.to.auth.password=$DOCKER_HUB_PASSWORD clean install
- name: Grant Execution Permission for `gradlew`
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew clean build jib -Djunit.jupiter.execution.parallel.enabled=true -Dmaven.javadoc.skip=true -Djib.to.auth.username=$DOCKER_HUB_USERNAME -Djib.to.auth.password=$DOCKER_HUB_PASSWORD
- name: Display Built Artifacts
run: |
dir
ls -R -l -h | grep -i ".jar$"
ls -R -l -h | grep "\.jar$"
check-version:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Java
- name: Setup Java
uses: actions/setup-java@v3.1.0
with:
java-version: ${{env.TERMURIN_VERSION}}
Expand Down
118 changes: 0 additions & 118 deletions .mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file removed .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
2 changes: 0 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties

This file was deleted.

22 changes: 13 additions & 9 deletions auth-center/auth-center-bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,20 @@ plugins {
id("com.google.cloud.tools.jib")
}

springBoot {
buildInfo()
val versionDetails: Closure<VersionDetails> by extra
val gitVersionDetails = versionDetails()

dependencies {
// MAF dependencies, and the dependencies in `bootstrap` have no need to be transitive
implementation(project(":auth-center-web"))
implementation(project(":auth-center-message"))
}

tasks.withType<BootJar> {
this.enabled = true
// archiveFileName = [baseName]-[gitHash]-[version]-[classifier].[extension]
this.archiveFileName.set("${archiveBaseName.get()}-${gitVersionDetails.gitHash}-${archiveVersion.get()}.${archiveExtension.get()}")
logger.info("Building Spring Boot executable jar: ${this.archiveFileName.get()}")
}

tasks.withType<BootRun> {
Expand All @@ -39,10 +47,8 @@ tasks.withType<ProcessResources> {
}
}

dependencies {
// MAF dependencies, and the dependencies in `bootstrap` have no need to be transitive
implementation(project(":auth-center-web"))
implementation(project(":auth-center-message"))
springBoot {
buildInfo()
}

// https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin
Expand All @@ -59,9 +65,7 @@ jib {
val projectArtifactId: String by properties
val authCenterArtifactId: String by properties
to.image = "$dockerHubRepositoryPrefix$projectArtifactId.$authCenterArtifactId"
val versionDetails: Closure<VersionDetails> by extra
val details = versionDetails()
to.tags = setOf("${details.gitHash}-${project.version}")
to.tags = setOf("${gitVersionDetails.gitHash}-${project.version}")
container.appRoot = "/$authCenterArtifactId"
val projectBuildSourceEncoding: String by properties
container.jvmFlags = listOf("-Dfile.encoding=$projectBuildSourceEncoding")
Expand Down
Loading

0 comments on commit 053eb8b

Please sign in to comment.