Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: PR checks

on:
pull_request:
branches:
- main
- v12

permissions:
contents: read

jobs:
backend-test:
name: Backend tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: Test
run: ./gradlew :backend:plugin:test

frontend-lint:
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
name: Frontend lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: npm install
working-directory: frontend

- name: Lint
run: npm run lint
working-directory: frontend
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
9 changes: 0 additions & 9 deletions .github/workflows/publish-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,9 @@ jobs:
env:
CHANGED_DIR: ${{ matrix.value }}

- id: gradleIntegrationTestTaskAlize
name: Construct Gradle integration test task name from matrix variant
run: CHANGED_DIR=${{ matrix.value }}; echo "TASK_NAME=$(echo :$CHANGED_DIR:integrationTesting | sed -e 's/\//:/g')">>${GITHUB_OUTPUT}
env:
CHANGED_DIR: ${{ matrix.value }}

- name: Test
run: ./gradlew ${{ steps.gradleTestTaskAlize.outputs.TASK_NAME }}

- name: Integration Test
run: ./gradlew ${{ steps.gradleIntegrationTestTaskAlize.outputs.TASK_NAME }}

- name: Publish
run: ./gradlew ${{ steps.gradleTaskAlize.outputs.TASK_NAME }}
env:
Expand Down
4 changes: 2 additions & 2 deletions backend/plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ val mockitoKotlinVersion: String by project

dockerCompose {
setProjectName("value-mapper")
isRequiredBy(project.tasks.integrationTesting)
isRequiredBy(project.tasks.test)

tasks.integrationTesting {
tasks.test {
useComposeFiles.addAll("$rootDir/docker-resources/docker-compose-base-test.yml")
}
}
Expand Down
6 changes: 0 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ subprojects {
}
}

tasks.test {
useJUnitPlatform {
excludeTags("integration")
}
}

tasks.getByName<BootJar>("bootJar") {
enabled = false
}
Expand Down
32 changes: 32 additions & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"root": true,
"ignorePatterns": ["projects/**/*", "dist/**/*", "node_modules/**/*"],
"overrides": [
{
"files": ["*.ts"],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-wrapper-object-types": "off",
"@angular-eslint/no-empty-lifecycle-method": "off",
"@angular-eslint/prefer-standalone": "off",
"no-empty": "warn"
}
},
{
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {
"@angular-eslint/template/eqeqeq": "warn",
"@angular-eslint/template/no-negated-async": "warn"
}
}
]
}
12 changes: 0 additions & 12 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,18 +132,6 @@
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
Expand Down
46 changes: 28 additions & 18 deletions frontend/projects/plugin/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
{
"extends": "../../../.eslintrc.json",
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "valtimo",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"type": "directive",
"prefix": "valtimo",
"style": "camelCase"
}
"extends": "../../.eslintrc.json",
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": ["*.ts"],
"rules": {
"@angular-eslint/component-selector": [
"warn",
{
"type": "element",
"prefix": "valtimo",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"warn",
{
"type": "directive",
"prefix": "valtimo",
"style": "camelCase"
}
]
}
},
{
"files": ["*.html"],
"rules": {}
}
]
}
}
9 changes: 2 additions & 7 deletions gradle/test.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@
* limitations under the License.
*/

tasks.register<Test>("integrationTesting") {
description = "Integration tests"
group = "verification"
tasks.named<Test>("test") {
systemProperty("spring.profiles.include", "inttest,postgresql")
useJUnitPlatform {
includeTags("integration")
}
mustRunAfter("check")
useJUnitPlatform()
doLast {
"composeDownForced"
}
Expand Down
Loading