From d11be42fb9180674c63ebaea682d62a4a2d7ef11 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 4 Feb 2024 09:57:37 +0900 Subject: [PATCH 1/2] Update workflow --- .github/workflows/lint-and-test-dev.yml | 24 +++++++++++++----------- .github/workflows/test-main.yml | 10 +++++----- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/lint-and-test-dev.yml b/.github/workflows/lint-and-test-dev.yml index f3df20de..479d8a24 100644 --- a/.github/workflows/lint-and-test-dev.yml +++ b/.github/workflows/lint-and-test-dev.yml @@ -28,6 +28,10 @@ on: - "**.kt" - "**.java" - .github/workflows/lint-and-test-dev.yml + +permissions: + contents: write # for Dependency submission + jobs: lint-and-test-dev: name: lint-and-test-dev @@ -39,20 +43,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Set up java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'corretto' - - name: Lint - uses: gradle/gradle-build-action@v2 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 with: - arguments: lintKotlin + dependency-graph: generate-and-submit + dependency-graph-continue-on-failure: false + - name: Lint + run: ./gradlew lintKotlin - name: Test - uses: gradle/gradle-build-action@v2 - with: - arguments: test - # TODO: Prepare a separate WF to be executed only when there is a change in build.gradle. - - name: Run snapshot action - uses: mikepenz/gradle-dependency-submission@v0.9.1 + run: ./gradlew lintKotlin test diff --git a/.github/workflows/test-main.yml b/.github/workflows/test-main.yml index 26cfd988..fea208cd 100644 --- a/.github/workflows/test-main.yml +++ b/.github/workflows/test-main.yml @@ -63,13 +63,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: 'Set up java ${{ matrix.java-version }}' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '${{ matrix.java-version }}' distribution: 'corretto' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - name: Test - uses: gradle/gradle-build-action@v2 - with: - arguments: test + run: ./gradlew lintKotlin test From 2071b0328438b158b19da48d020104af62c1a362 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Sun, 4 Feb 2024 10:08:53 +0900 Subject: [PATCH 2/2] Fix build gradle --- build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index bab72278..7000ab8f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -98,6 +98,11 @@ public val kogeraVersion: Version = VersionUtil.parseVersion("$version", "$group into(file("$generatedSrcPath/${packageStr.replace(".", "/")}")) } + // Added to avoid failure in generating dependency graphs in CI. + lintKotlinMain { + dependsOn.add(generateKogeraVersion) + } + compileKotlin { dependsOn.add(generateKogeraVersion) kotlinOptions.jvmTarget = "1.8"