Skip to content
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

Jump to bottom

Fix build, inject kotlin.mpp.enableCompatibilityMetadataVariant in CI #2751

Merged
merged 1 commit into from Jun 28, 2022
Merged

Fix build, inject kotlin.mpp.enableCompatibilityMetadataVariant in CI #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/generate-alpha-tag.yaml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Gradle build
uses: gradle/gradle-build-action@v2.2.0
with:
arguments: --full-stacktrace assemble "-Psemver.stage=alpha"
arguments: --full-stacktrace build "-Psemver.stage=alpha"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is it not necessary to inject it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to run the full build, with tests before we create the tag/release, right?
The publish workflow is completely separate from this, so they shouldn't interfere with each other.


- name: Stop Gradle daemons
run: ./gradlew --stop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-tag.yaml
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Gradle build
uses: gradle/gradle-build-action@v2.2.0
with:
arguments: --full-stacktrace assemble "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
arguments: --full-stacktrace build "-Psemver.scope=${{ github.event.inputs.scope }}" "-Psemver.stage=${{ github.event.inputs.stage }}"
i-walker marked this conversation as resolved.
Show resolved Hide resolved

- name: Stop Gradle daemons
run: ./gradlew --stop
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Build
uses: gradle/gradle-build-action@v2.2.0
with:
arguments: assemble --full-stacktrace
arguments: assemble -Pkotlin.mpp.enableCompatibilityMetadataVariant=true --full-stacktrace

- name: Get Arrow version
id: version
Expand All @@ -65,7 +65,7 @@ jobs:
contains(steps.version.outputs.arrow, 'beta') ||
contains(steps.version.outputs.arrow, 'rc')
with:
arguments: --full-stacktrace publishToSonatype closeAndReleaseSonatypeStagingRepository
arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true publishToSonatype closeAndReleaseSonatypeStagingRepository

- name: Publish final version
uses: gradle/gradle-build-action@v2.2.0
Expand All @@ -74,7 +74,7 @@ jobs:
!contains(steps.version.outputs.arrow, 'beta') &&
!contains(steps.version.outputs.arrow, 'rc')
with:
arguments: --full-stacktrace publishToSonatype closeSonatypeStagingRepository
arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true publishToSonatype closeSonatypeStagingRepository

- name: Prepare environment
working-directory: arrow-site
Expand All @@ -87,7 +87,7 @@ jobs:
- name: Create API doc
uses: gradle/gradle-build-action@v2.2.0
with:
arguments: --full-stacktrace dokkaGfm
arguments: --full-stacktrace -Pkotlin.mpp.enableCompatibilityMetadataVariant=true dokkaGfm

- name: Build release directory (/docs)
working-directory: arrow-site
Expand Down Expand Up @@ -160,4 +160,4 @@ jobs:
path: arrow-libs/logs.

- name: Stop Gradle daemons
run: ./gradlew --stop
run: ./gradlew -Pkotlin.mpp.enableCompatibilityMetadataVariant=true --stop
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Expand Up @@ -29,13 +29,13 @@ jobs:
uses: gradle/gradle-build-action@v2.2.0
if: matrix.os != 'windows-latest'
with:
arguments: --full-stacktrace assemble
arguments: --full-stacktrace build

- name: mingwX64Test
uses: gradle/gradle-build-action@v2.2.0
if: matrix.os == 'windows-latest'
with:
arguments: --full-stacktrace assemble
arguments: --full-stacktrace mingwX64Test

- name: Upload reports
uses: actions/upload-artifact@v3.1.0
Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-continuations/build.gradle.kts
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-core-retrofit/build.gradle.kts
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-core/build.gradle.kts
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
4 changes: 2 additions & 2 deletions arrow-libs/fx/arrow-fx-stm/build.gradle.kts
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand All @@ -30,7 +30,7 @@ kotlin {
if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(project(":arrow-coroutines-fx-test"))
implementation(project(":arrow-fx-coroutines-test"))
}
}
jvmTest {
Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/optics/arrow-optics/build.gradle.kts
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ val enableCompatibilityMetadataVariant =

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
enabled = false
exclude("**/*")
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ kotlin.mpp.stability.nowarn=true
kotlin.native.ignoreIncorrectDependencies=true
kotlin.native.ignoreDisabledTargets=true
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.mpp.enableCompatibilityMetadataVariant=false
# https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-4773544.0-0
kapt.use.worker.api=false

Expand Down