Tidy publishing config (#17)

* remove custom POM location (Gradle gets confused)

* - update GitHub actions
- use new `gradle/actions/setup-gradle`
- block cancel-in-progress for publish.yml
This commit is contained in:
Adam 2024-03-27 18:54:49 +01:00 committed by GitHub
parent 1ef2045b32
commit c801a9703f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 21 deletions

View file

@ -28,7 +28,7 @@ jobs:
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java-version }} - name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v3 uses: actions/setup-java@v3
@ -37,17 +37,16 @@ jobs:
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Validate Gradle wrapper - name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1 uses: gradle/wrapper-validation-action@v2
- name: Cache Kotlin Konan - name: Cache Kotlin Konan
id: cache-kotlin-konan uses: actions/cache@v4
uses: actions/cache@v3
with: with:
path: ~/.konan/**/* path: ~/.konan/**/*
key: kotlin-konan-${{ runner.os }} key: kotlin-konan-${{ runner.os }}
- name: Test with Gradle - name: Set up Gradle
uses: gradle/gradle-build-action@v2 uses: gradle/actions/setup-gradle@v3
with:
gradle-home-cache-cleanup: true - name: Publish
arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }} run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}

View file

@ -9,32 +9,36 @@ env:
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }}
concurrency:
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
# Don't cancel midway through publishing if another workflow is triggered, it might cause partial publications
cancel-in-progress: false
jobs: jobs:
publish: publish:
runs-on: macos-latest runs-on: macos-latest
env:
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
java-version: "11" java-version: "11"
distribution: "zulu" distribution: "zulu"
cache: "gradle"
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2
- name: Cache Kotlin Konan - name: Cache Kotlin Konan
id: cache-kotlin-konan uses: actions/cache@v4
uses: actions/cache@v3
with: with:
path: ~/.konan/**/* path: ~/.konan/**/*
key: kotlin-konan-${{ runner.os }} key: kotlin-konan-${{ runner.os }}
- name: Build - name: Set up Gradle
uses: gradle/gradle-build-action@v2 uses: gradle/actions/setup-gradle@v3
- name: Publish - name: Publish
run: ./gradlew publish --no-parallel --stacktrace run: ./gradlew publish --no-parallel --stacktrace

View file

@ -87,10 +87,6 @@ tasks {
val signingRequiredPredicate = provider { signing.isRequired } val signingRequiredPredicate = provider { signing.isRequired }
onlyIf { signingRequiredPredicate.get() } onlyIf { signingRequiredPredicate.get() }
} }
withType<GenerateMavenPom> {
destination = file("$projectDir/pom.xml")
}
} }
// https://youtrack.jetbrains.com/issue/KT-46466 // https://youtrack.jetbrains.com/issue/KT-46466