Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-adaptive authored Jul 29, 2024
2 parents 99567a3 + db77629 commit 4f82971
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 54 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Dependency Submission

on:
push:
branches: [ 'master' ]

permissions:
contents: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false

jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
with:
build-scan-publish: true
build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"
build-scan-terms-of-use-agree: "yes"
46 changes: 0 additions & 46 deletions .github/workflows/publish.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
contents: write
packages: write
needs: [ ci, ci-low-cadence, codeql ]
runs-on: ubuntu-latest
runs-on: self-hosted
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Publish a release
run: ./gradlew publish
env:
SIGNING_GPG_SECRET_KEY: ${{ secrets.GPG_RSA_SIGN_KEY }}
SIGNING_GPG_PASSWORD: ${{ secrets.GPG_RSA_SIGN_KEYPASS }}
OSSRH_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
SIGNING_GPG_SECRET_KEY: ${{ secrets.signingKey }}
SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }}
OSSRH_USERNAME: ${{ secrets.ossrhUsername }}
OSSRH_PASSWORD: ${{ secrets.ossrhPassword }}
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def getConfigProperty(final String projectPropertyName, final String envVarName)
ext {
isReleaseVersion = !agronaVersion.endsWith('-SNAPSHOT')

ossrhReleasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
ossrhSnapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
ossrhReleasesRepoUrl = 'http://localhost:8081/artifactory/test-maven-repo/'
ossrhSnapshotsRepoUrl = 'http://localhost:8081/artifactory/test-maven-repo/'
ossrhUsername = getConfigProperty('ossrhUsername', 'OSSRH_USERNAME')
ossrhPassword = getConfigProperty('ossrhPassword', 'OSSRH_PASSWORD')

Expand Down Expand Up @@ -357,6 +357,7 @@ project(':agrona') {
maven {
name = 'MavenCentral'
url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
allowInsecureProtocol = true
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -442,6 +443,7 @@ project(':agrona-agent') {
maven {
name = 'MavenCentral'
url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
allowInsecureProtocol = true
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.22.0-SNAPSHOT
1000.2.0-SNAPSHOT

0 comments on commit 4f82971

Please sign in to comment.