Skip to content

Commit c742bab

Browse files
authored
Set up sonatype publishing (#26)
* Set up sonatype publishing * Drift
1 parent 676e6bd commit c742bab

File tree

3 files changed

+33
-28
lines changed

3 files changed

+33
-28
lines changed

.github/workflows/main-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
with:
2626
arguments: build snapshot --stacktrace -PenableCoverage=true
2727
env:
28-
PUBLISH_USERNAME: ${{ github.actor }}
29-
PUBLISH_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
28+
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
29+
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
3030
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
3131
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
3232
- name: Upload to GitHub Actions

.github/workflows/release-build.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,15 @@ jobs:
2525
with:
2626
arguments: build jibDockerBuild final -Prelease.version=${{ github.event.inputs.version }} --stacktrace
2727
env:
28-
PUBLISH_USERNAME: ${{ github.actor }}
29-
PUBLISH_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
28+
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
29+
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
3030
GRGIT_USER: ${{ github.actor }}
3131
GRGIT_PASS: ${{ secrets.GITHUB_TOKEN }}
3232
AWS_REGISTRY_ACCOUNT: ${{ secrets.AWS_ACCOUNT }}
3333
COMMIT_HASH: ${{ github.event.inputs.version }}
3434
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
3535
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
3636

37-
- name: Configure AWS credentials
38-
uses: aws-actions/configure-aws-credentials@v1
39-
with:
40-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
41-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
42-
aws-region: us-west-2
43-
44-
- name: Login to Amazon ECR
45-
id: login-ecr
46-
uses: aws-actions/amazon-ecr-login@v1
47-
48-
- name: Push image to Amazon ECR
49-
env:
50-
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
51-
run: |
52-
docker images
53-
docker push $ECR_REGISTRY/springboot:${{ github.event.inputs.version }}
54-
docker push $ECR_REGISTRY/spark:${{ github.event.inputs.version }}
55-
5637
- name: Create Release
5738
id: create_release
5839
uses: actions/create-release@v1
@@ -74,3 +55,22 @@ jobs:
7455
asset_path: otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar
7556
asset_name: aws-opentelemetry-agent.jar
7657
asset_content_type: application/java-archive
58+
59+
- name: Configure AWS credentials
60+
uses: aws-actions/configure-aws-credentials@v1
61+
with:
62+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
63+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
64+
aws-region: us-west-2
65+
66+
- name: Login to Amazon ECR
67+
id: login-ecr
68+
uses: aws-actions/amazon-ecr-login@v1
69+
70+
- name: Push image to Amazon ECR
71+
env:
72+
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
73+
run: |
74+
docker images
75+
docker push $ECR_REGISTRY/springboot:${{ github.event.inputs.version }}
76+
docker push $ECR_REGISTRY/spark:${{ github.event.inputs.version }}

build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
1919
plugins {
2020
java
2121
id("nebula.release") version "15.1.0"
22+
id("io.codearte.nexus-staging") version "0.22.0"
2223
id("com.diffplug.spotless") version "5.1.2"
2324
id("com.github.jk1.dependency-license-report") version "1.14"
2425
}
@@ -184,14 +185,18 @@ allprojects {
184185
}
185186
}
186187

188+
val isSnapshot = version.toString().endsWith("SNAPSHOT")
189+
187190
repositories {
188-
// For now, we only publish to GitHub Packages
189191
maven {
190-
name = "GitHubPackages"
191-
url = uri("https://maven.pkg.github.com/aws-observability/aws-otel-java-instrumentation")
192+
name = "Sonatype"
193+
url = uri(
194+
if (isSnapshot) "https://aws.oss.sonatype.org/content/repositories/snapshots/"
195+
else "https://aws.oss.sonatype.org/service/local/staging/deploy/maven2"
196+
)
192197
credentials {
193-
username = project.findProperty("gpr.user") as String? ?: System.getenv("PUBLISH_USERNAME")
194-
password = project.findProperty("gpr.key") as String? ?: System.getenv("PUBLISH_PASSWORD")
198+
username = System.getenv("PUBLISH_USERNAME")
199+
password = System.getenv("PUBLISH_PASSWORD")
195200
}
196201
}
197202
}

0 commit comments

Comments
 (0)