From e103795e3fbc0b87729b445f4fe2fdef8d347346 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Fri, 11 Oct 2024 17:52:02 -0300 Subject: [PATCH 1/9] add CD --- .github/workflows/publish-to-maven.yaml | 43 +++++++++++++++++++++++++ CHANGELOG.md | 8 ++++- gradle.properties | 3 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/publish-to-maven.yaml diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml new file mode 100644 index 0000000..5909d31 --- /dev/null +++ b/.github/workflows/publish-to-maven.yaml @@ -0,0 +1,43 @@ +name: Release + +on: + release: + types: [published] + +env: + lockfile: pnpm-lock.yaml + node_version: "18" + +jobs: + publishToMaven: + environment: + name: "MavenCentral" + + runs-on: ubuntu-latest + timeout-minutes: 30 + + steps: + - uses: actions/checkout@v4 + + - name: Enable KVM + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + + - name: Make Gradle executable + run: chmod +x ./gradlew + + - name: Upload library + run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral + env: + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a8c3a..e9c9248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 We follow the format used by [Open Telemetry](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md). -## Version 1.1.0-alpha.0 (2024-09-12) +## Version 1.1.1 (2024-10-11) + +### Added + +- Added CD support by @anonvt in + +## Version 1.1.0 (2024-09-12) ### Added diff --git a/gradle.properties b/gradle.properties index a093ac8..fb217ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,11 +26,12 @@ android.nonTransitiveRClass=true topsort.sample.bearertoken=BEARER_TOKEN SONATYPE_HOST=CENTRAL_PORTAL +SONATYPE_AUTOMATIC_RELEASE=true RELEASE_SIGNING_ENABLED=true GROUP=com.topsort POM_ARTIFACT_ID=topsort-kt -VERSION_NAME=1.1.0 +VERSION_NAME=1.1.1 POM_NAME=Topsort Analytics POM_DESCRIPTION=An Android library for interacting with the Topsort APIs. We currently support sending events and making auction calls but will add more features shortly. From 43cc165a999313a3b3a3e932af8a091659be0478 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Fri, 11 Oct 2024 17:54:59 -0300 Subject: [PATCH 2/9] changed comment --- .github/workflows/publish-to-maven.yaml | 4 ---- CHANGELOG.md | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index 5909d31..7afd1f5 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -4,10 +4,6 @@ on: release: types: [published] -env: - lockfile: pnpm-lock.yaml - node_version: "18" - jobs: publishToMaven: environment: diff --git a/CHANGELOG.md b/CHANGELOG.md index e9c9248..57169ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ We follow the format used by [Open Telemetry](https://github.com/open-telemetry/ ### Added -- Added CD support by @anonvt in +- Added CD support by @anonvt in ([#28](https://github.com/Topsort/topsort.kt/pull/28)) ## Version 1.1.0 (2024-09-12) From c11a9e52736421d5b1b71942749f49be5dbc57ed Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Fri, 11 Oct 2024 18:00:05 -0300 Subject: [PATCH 3/9] lint --- .github/workflows/publish-to-maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index 7afd1f5..aeb9619 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -36,4 +36,4 @@ jobs: ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} \ No newline at end of file + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} From e5d66bd615eb7f753f405a5d4d285d773a43c18f Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Mon, 14 Oct 2024 13:47:44 -0300 Subject: [PATCH 4/9] removed kvm and gradle +x --- .github/workflows/publish-to-maven.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index aeb9619..7dd8954 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -15,21 +15,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Enable KVM - run: | - echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules - sudo udevadm control --reload-rules - sudo udevadm trigger --name-match=kvm - - name: Setup JDK uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 - - name: Make Gradle executable - run: chmod +x ./gradlew - - name: Upload library run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral env: From b826e7fce17795ddeadef5491ef9e7920bfa17a2 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Mon, 14 Oct 2024 14:02:00 -0300 Subject: [PATCH 5/9] Update .github/workflows/publish-to-maven.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Johan Bergström --- .github/workflows/publish-to-maven.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index 7dd8954..15e5eec 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -9,7 +9,7 @@ jobs: environment: name: "MavenCentral" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: From 7b205833f77cbb14c5a5a90b9d960b3368bbcc7d Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Mon, 14 Oct 2024 14:36:52 -0300 Subject: [PATCH 6/9] split off build step --- .github/workflows/publish-to-maven.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index 15e5eec..ab6c76d 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -5,22 +5,26 @@ on: types: [published] jobs: + build: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + + - name: Build library + run: ./gradlew :TopsortAnalytics:compileReleaseKotlin + publishToMaven: environment: name: "MavenCentral" + needs: build + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - uses: actions/checkout@v4 - - name: Setup JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - name: Upload library run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral env: From 661bf40ba0e6643af24c602982386032b77a2183 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Tue, 15 Oct 2024 15:55:52 -0300 Subject: [PATCH 7/9] testing automation --- .github/workflows/publish-to-maven.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index ab6c76d..c9f8c02 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -1,8 +1,7 @@ name: Release on: - release: - types: [published] + pull_request: jobs: build: @@ -28,7 +27,7 @@ jobs: - name: Upload library run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral env: - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY_WRONG }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME_WRONG }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} From 27ca9b250d774996f170a9b44dcc9d8ebdd60c58 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Tue, 15 Oct 2024 16:11:04 -0300 Subject: [PATCH 8/9] shipping automation --- .github/workflows/publish-to-maven.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index c9f8c02..ab6c76d 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -1,7 +1,8 @@ name: Release on: - pull_request: + release: + types: [published] jobs: build: @@ -27,7 +28,7 @@ jobs: - name: Upload library run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral env: - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY_WRONG }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }} - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME_WRONG }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} From c392bf8fa1cfd62cb857916bd1138792591b5d74 Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Tue, 15 Oct 2024 16:12:54 -0300 Subject: [PATCH 9/9] build on the same job, different step --- .github/workflows/publish-to-maven.yaml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-to-maven.yaml b/.github/workflows/publish-to-maven.yaml index ab6c76d..95d1a6c 100644 --- a/.github/workflows/publish-to-maven.yaml +++ b/.github/workflows/publish-to-maven.yaml @@ -5,26 +5,19 @@ on: types: [published] jobs: - build: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v4 - - - name: Build library - run: ./gradlew :TopsortAnalytics:compileReleaseKotlin - publishToMaven: environment: name: "MavenCentral" - needs: build - runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - uses: actions/checkout@v4 + - name: Build library + run: ./gradlew :TopsortAnalytics:compileReleaseKotlin + - name: Upload library run: ./gradlew :TopsortAnalytics:publishAndReleaseToMavenCentral env: