From 701066c075d3f7a20ca0c749cd42ab3f292c8522 Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Thu, 23 Nov 2023 20:37:19 +0100 Subject: [PATCH] chore(ci): introduce kodein-internal-github-actions --- .github/workflows/release.yml | 57 ++++++---------------------------- .github/workflows/snapshot.yml | 24 +++----------- .github/workflows/test.yml | 17 ++-------- settings.gradle.kts | 3 +- 4 files changed, 19 insertions(+), 82 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eab5307..82caa60 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,19 +6,8 @@ on: jobs: create-staging-repository: - name: Create staging repository - runs-on: ubuntu-latest - outputs: - repository_id: ${{ steps.create.outputs.repository_id }} - steps: - - id: create - uses: nexus-actions/create-nexus-staging-repo@v1.1 - with: - base_url: https://s01.oss.sonatype.org/service/local/ - username: ${{ secrets.SONATYPE_USERNAME }} - password: ${{ secrets.SONATYPE_PASSWORD }} - staging_profile_id: ${{ secrets.SONATYPE_PROFILE_ID }} - description: ${{ github.repository }}/${{ github.workflow }}#${{ github.run_number }} + uses: kosi-libs/kodein-internal-github-actions/.github/workflows/create-nexus-staging-repository.yml@main + secrets: inherit build-upload: needs: create-staging-repository @@ -32,21 +21,8 @@ jobs: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - name: Check out - uses: actions/checkout@v2 - - name: Cached Konan - uses: actions/cache@v2 - with: - path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-konan- - - name: Cached Gradle - uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 #v2 - - name: Set up JDK 17 - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3 - with: - java-version: 17 - distribution: 'temurin' + - name: Setup + uses: kosi-libs/kodein-internal-github-actions/setup@main # Host only for MacOS / Windows - name: Check (macos / windows) if: matrix.os != 'ubuntu-latest' @@ -66,24 +42,11 @@ jobs: run: ./gradlew publishAllPublicationsToOssrhStagingRepository -Porg.kodein.sonatype.repositoryId=${{ needs.create-staging-repository.outputs.repository_id }} shell: bash - drop-or-release: + drop-or-release-staging-repository: needs: [create-staging-repository, build-upload] - runs-on: ubuntu-latest if: ${{ always() && needs.create-staging-repository.result == 'success' }} - steps: - - name: Discard - if: ${{ needs.build-upload.result != 'success' }} - uses: nexus-actions/drop-nexus-staging-repo@v1 - with: - base_url: https://s01.oss.sonatype.org/service/local/ - username: ${{ secrets.SONATYPE_USERNAME }} - password: ${{ secrets.SONATYPE_PASSWORD }} - staging_repository_id: ${{ needs.create-staging-repository.outputs.repository_id }} - - name: Release - if: ${{ needs.build-upload.result == 'success' }} - uses: nexus-actions/release-nexus-staging-repo@v1 - with: - base_url: https://s01.oss.sonatype.org/service/local/ - username: ${{ secrets.SONATYPE_USERNAME }} - password: ${{ secrets.SONATYPE_PASSWORD }} - staging_repository_id: ${{ needs.create-staging-repository.outputs.repository_id }} \ No newline at end of file + uses: kosi-libs/kodein-internal-github-actions/.github/workflows/drop-or-release-nexus-staging-repository.yml@main + secrets: inherit + with: + repository-id: ${{ needs.create-staging-repository.outputs.repository-id }} + build-upload-result: ${{ needs.build-upload.result }} \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 0db9b00..43d565e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -13,32 +13,18 @@ on: - './github/**' - '!./github/workflow/snapshot.yml' -env: - SONATYPE_USERNAME: ${{ secrets.sonatype_username }} - SONATYPE_PASSWORD: ${{ secrets.sonatype_password }} - jobs: build-upload: runs-on: ${{ matrix.os }} + env: + SONATYPE_USERNAME: ${{ secrets.sonatype_username }} + SONATYPE_PASSWORD: ${{ secrets.sonatype_password }} strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - name: Check out - uses: actions/checkout@v2 - - name: Cached Konan - uses: actions/cache@v2 - with: - path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-konan- - - name: Cached Gradle - uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 #v2 - - name: Set up JDK 17 - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3 - with: - java-version: 17 - distribution: 'temurin' + - name: Setup + uses: kosi-libs/kodein-internal-github-actions/setup@main # Host only for MacOS / Windows - name: Check (macos / windows) if: matrix.os != 'ubuntu-latest' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35ae781..90e54a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,21 +17,8 @@ jobs: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - name: Check out - uses: actions/checkout@v2 - - name: Cached Konan - uses: actions/cache@v2 - with: - path: ~/.konan - key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-konan- - - name: Cached Gradle - uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 #v2 - - name: Set up JDK 17 - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3 - with: - java-version: 17 - distribution: 'temurin' + - name: Setup + uses: kosi-libs/kodein-internal-github-actions/setup@main - name: Check run: ./gradlew check shell: bash diff --git a/settings.gradle.kts b/settings.gradle.kts index cd69c32..56194f2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,11 @@ buildscript { repositories { mavenLocal() + gradlePluginPortal() maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo") } dependencies { - classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.3.0") + classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.4.2") } }