Skip to content

ci: bump shared workflow + conventions pins #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorisjonkers-dev-agents merged 2 commits into from
Jul 3, 2026
Merged

ci: bump shared workflow + conventions pins #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f6dfd7
ci: bump shared workflow pins
ExtraToast Jul 3, 2026
215052e
Fix CI after convention bump
ExtraToast Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'jobs':
'jvm':
'name': 'JVM'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/jvm-ci.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/jvm-ci.yml@v0.10.2'
'with':
'lint-gradle-args': ':api:detektMain :api:detektTest :api:detektIntegrationTest :api:ktlintCheck'
'test-gradle-args': ':api:test :api:integrationTest :api:jacocoTestCoverageVerification :api:exportOpenApiSpec'
Expand All @@ -28,32 +28,35 @@

'python-lint':
'name': 'Python Lint'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.10.2'
'with':
'python-version': '3.12'
'working-directory': 'ingest-worker'
'install-command': 'python -m pip install uv==0.7.8 && uv sync --frozen'
'lint-command': 'uv run ruff check . && uv run mypy'
'lint-command': 'uv run ruff check .'
'typecheck-command': 'uv run mypy'
'test-command': ''

'python-unit':
'name': 'Python Unit'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.10.2'
'with':
'python-version': '3.12'
'working-directory': 'ingest-worker'
'install-command': 'python -m pip install uv==0.7.8 && uv sync --frozen'
'lint-command': ''
'typecheck-command': ''
'test-command': 'uv run pytest --cov'

'python-integration':
'name': 'Python Integration'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/python-ci.yml@v0.10.2'
'with':
'python-version': '3.12'
'working-directory': 'ingest-worker'
'install-command': 'python -m pip install uv==0.7.8 && uv sync --frozen'
'lint-command': ''
'typecheck-command': ''
'test-command': 'uv run pytest -m integration'

'contract':
Expand Down Expand Up @@ -112,7 +115,7 @@

'client-dry-run':
'name': 'Client Dry Run'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.10.2'
'permissions':
'contents': 'read'
'packages': 'write'
Expand Down Expand Up @@ -164,7 +167,7 @@

'deploy-bundle':
'name': 'Deploy Bundle Dry Run'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.10.2'
'permissions':
'contents': 'read'
'packages': 'write'
Expand All @@ -180,7 +183,7 @@

'migration-guard':
'name': 'Migration Guard'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/migration-guard.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/migration-guard.yml@v0.10.2'
'with':
'migration-regex': 'api/src/main/resources/db/migration(-pg)?/V(1[3-9]|[2-9][0-9]|[1-9][0-9]{2,})[^/]*\.sql$'
'scope-regex': '(api/src/main/resources/db)/.*'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
'name': 'Publish API Clients'
'needs': 'release-please'
'if': '${{ needs.release-please.outputs.release_created == ''true'' }}'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/publish-api-clients.yml@v0.10.2'
'permissions':
'contents': 'read'
'packages': 'write'
Expand All @@ -101,7 +101,7 @@
- 'release-please'
- 'publish-images'
'if': '${{ needs.release-please.outputs.release_created == ''true'' }}'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/deploy-bundle.yml@v0.10.2'
'permissions':
'contents': 'read'
'packages': 'write'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repository-hygiene.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

'jobs':
'repository-hygiene':
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/repository-hygiene-guard.yml@v0.8.1'
'uses': 'JorisJonkers-dev/github-workflows/.github/workflows/repository-hygiene-guard.yml@v0.10.2'
'with':
'allowlist-regex': ''
'secrets': 'inherit'
13 changes: 13 additions & 0 deletions api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension

plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
alias(libs.plugins.jorisjonkers.spring)
alias(libs.plugins.jorisjonkers.detekt)
alias(libs.plugins.jorisjonkers.ktlint)
alias(libs.plugins.jorisjonkers.testing)
alias(libs.plugins.jorisjonkers.jooq.codegen)
}

val kotlinVersion = libs.versions.kotlin.get()

configurations.matching { it.name == "detekt" }.configureEach {
resolutionStrategy.eachDependency {
if (requested.group == "org.jetbrains.kotlin" && requested.name == "kotlin-compiler-embeddable") {
useVersion(kotlinVersion)
because("detekt 2.0.0-alpha.3 is compiled with Kotlin $kotlinVersion")
}
}
}

jooqCodegen {
schemaName.set("PUBLIC")
packageName.set("com.jorisjonkers.personalstack.knowledge.jooq")
Expand Down
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[versions]
jorisjonkers-commons = "0.7.0"
jorisjonkers-conventions = "0.5.1"
jorisjonkers-conventions = "0.7.0"
kotlin = "2.3.21"

[libraries]
kotlin-commons-archunit-test = { module = "dev.jorisjonkers:kotlin-commons-archunit-test", version.ref = "jorisjonkers-commons" }
Expand All @@ -18,6 +19,8 @@ kotlin-commons-vault = { module = "dev.jorisjonkers:kotlin-commons-vault", versi
kotlin-commons-web = { module = "dev.jorisjonkers:kotlin-commons-web", version.ref = "jorisjonkers-commons" }

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
jorisjonkers-kotlin = { id = "dev.jorisjonkers.kotlin", version.ref = "jorisjonkers-conventions" }
jorisjonkers-detekt = { id = "dev.jorisjonkers.detekt", version.ref = "jorisjonkers-conventions" }
jorisjonkers-ktlint = { id = "dev.jorisjonkers.ktlint", version.ref = "jorisjonkers-conventions" }
Expand Down
Loading