-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: Experiment with simpler CI steps
Current CI performs matrix builds for the different colour and store variants. In theory this allows a build to succeed for most variants and fail for only one. In practice, this is of limited use, as an issue that causes one variant to file will likely cause them all to fail. The separate builds require a lengthy configuration phase because the configuration cache is not shared or restored across builds. Experiment with a simpler CI workflow that checks and asssembles all variants at once. As well as avoiding the repeated configuration phases this may allow better parallelisation across the build steps for different variants. As part of this cleanup: - Remove unnecessary `gradle.properties` and `settings.gradle` files for projects that are included as subprojects, not included builds. - Provide a build convention plugin for command line tools, and use `libs.versions.toml` for command line tool dependencies. Adjust the individual tool `build.gradle.kts` files accordingly. - Add a trivial test for each command line tool so there are tests to run and provide some confidence that automated library upgrades don't break command line tool compilation.
- Loading branch information
1 parent
4d7f8d4
commit e979c0f
Showing
18 changed files
with
174 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| tags: | ||
| - '*' | ||
| pull_request: | ||
| workflow_dispatch: | ||
|
|
||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 | ||
|
|
||
| - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4 | ||
| with: | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
|
|
||
| - name: Gradle Wrapper Validation | ||
| uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2 | ||
|
|
||
| - name: Copy CI gradle.properties | ||
| run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78 # v3 | ||
| with: | ||
| cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} | ||
|
|
||
| # Disable the configuration cache; it's not restored, or saved at the end, so this | ||
| # removes any overhead trying to load or save it. | ||
| - name: Check and assemble everything | ||
| run: ./gradlew --no-configuration-cache build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
build-logic/convention/src/main/kotlin/app/pachli/ToolConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024 Pachli Association | ||
| * | ||
| * This file is a part of Pachli. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it under the terms of the | ||
| * GNU General Public License as published by the Free Software Foundation; either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * Pachli is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even | ||
| * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
| * Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with Pachli; if not, | ||
| * see <http://www.gnu.org/licenses>. | ||
| */ | ||
|
|
||
| import app.pachli.libs | ||
| import org.gradle.api.Plugin | ||
| import org.gradle.api.Project | ||
| import org.gradle.kotlin.dsl.dependencies | ||
|
|
||
| class ToolConventionPlugin : Plugin<Project> { | ||
| override fun apply(target: Project) { | ||
| with(target) { | ||
| dependencies { | ||
| add("implementation", libs.findLibrary("kotlin-logging-jvm").get()) | ||
| add("implementation", libs.findLibrary("logback").get()) | ||
| add("implementation", libs.findLibrary("clikt").get()) | ||
|
|
||
| add("testImplementation", libs.findLibrary("truth").get()) | ||
| add("testImplementation", libs.findLibrary("junit-jupiter").get()) | ||
| add("testImplementation", libs.findLibrary("junit-jupiter-params").get()) | ||
| add("testRuntimeOnly", "org.junit.platform:junit-platform-launcher") | ||
| } | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.