diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml new file mode 100644 index 000000000..dafdc0278 --- /dev/null +++ b/.github/workflows/dependency-submission.yml @@ -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" \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 7634cc6c6..000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Publish a release to the Maven Central Repository - -on: - repository_dispatch: - types: [publish_artifacts] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' - -jobs: - build: - runs-on: ubuntu-22.04 - name: Release task - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.gitRef }} - - name: Cache Gradle dependencies - uses: actions/cache@v4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Cache Gradle wrappers - uses: actions/cache@v4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - name: Setup java - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 8 - - name: Publish a release - run: ./gradlew publish - env: - SIGNING_GPG_SECRET_KEY: ${{ secrets.signingKey }} - SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} - OSSRH_USERNAME: ${{ secrets.ossrhUsername }} - OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7608228bd..d27c98d87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 }} diff --git a/build.gradle b/build.gradle index 4f6dcd3e8..e76d9d6ca 100644 --- a/build.gradle +++ b/build.gradle @@ -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') @@ -357,6 +357,7 @@ project(':agrona') { maven { name = 'MavenCentral' url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl) + allowInsecureProtocol = true credentials { username = ossrhUsername password = ossrhPassword @@ -442,6 +443,7 @@ project(':agrona-agent') { maven { name = 'MavenCentral' url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl) + allowInsecureProtocol = true credentials { username = ossrhUsername password = ossrhPassword diff --git a/version.txt b/version.txt index 2fbf9b3a4..41bc85478 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.22.0-SNAPSHOT \ No newline at end of file +1000.2.0-SNAPSHOT \ No newline at end of file