From 1f22468819cf2c1047eb889a2f6ba2be6364a08e Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 25 Jun 2024 07:08:26 -0400 Subject: [PATCH 01/94] initial commit --- .github/workflows/publish.yml | 96 +++++++++++++++++++++++++++++------ build.gradle | 2 +- version.txt | 1 + 3 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 version.txt diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7634cc6c6..f22d6807a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,8 +1,26 @@ name: Publish a release to the Maven Central Repository on: - repository_dispatch: - types: [publish_artifacts] + workflow_dispatch: + inputs: + patch: + description: Is patch? (Will only update tagged version.txt) + required: true + default: false + type: boolean + release: + description: Is release? (Will update master version.txt) + required: true + default: false + type: boolean + tag: + description: Release Version (For tagged version.txt) + required: true + type: string + snapshot-tag: + description: New Version (For master version.txt) + required: true + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -12,31 +30,59 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - build: + tag-release: + permissions: + contents: write + runs-on: ubuntu-22.04 + steps: + - name: checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + - name: Push Tag + id: commit-tag + if: ${{ inputs.release || inputs.patch }} + run: | + echo ${{ inputs.tag }} > version.txt + git status + git commit -am "${{ inputs.tag }} released." + git tag -f ${{ inputs.tag }} + git push origin refs/tags/${{ inputs.tag }} + + build-java: 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') }} + ref: ${{ github.sha }} + - name: update-version + if: ${{ inputs.release || inputs.patch }} + run: | + echo ${{ inputs.tag }} > version.txt +# - 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: Setup BUILD_JAVA_HOME & BUILD_JAVA_VERSION + run: | + java -Xinternalversion + echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV + echo "BUILD_JAVA_VERSION=8" >> $GITHUB_ENV - name: Publish a release run: ./gradlew publish env: @@ -44,3 +90,21 @@ jobs: SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} + + update-tags: + permissions: + contents: write + needs: build-java + runs-on: ubuntu-22.04 + steps: + - name: checkout + uses: actions/checkout@v4 + with: + ref: master + - name: Update master + if: ${{ inputs.release }} + run: | + echo ${{ inputs.snapshot-tag }} > version.txt + git status + git commit -am "post ${{ inputs.tag }} release bump" + git push origin master \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7975bd437..5680ec1b1 100644 --- a/build.gradle +++ b/build.gradle @@ -69,7 +69,7 @@ def jmhVersion = '1.37' def jcstressVersion = '0.16' def agronaGroup = 'org.agrona' -def agronaVersion = '1.22.0-SNAPSHOT' +def agronaVersion = file('version.txt').text.trim() def getConfigProperty(final String projectPropertyName, final String envVarName) { String value = project.findProperty(projectPropertyName) diff --git a/version.txt b/version.txt new file mode 100644 index 000000000..d8c67589c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +1.22.0-SNAPSHOT From 944f5f5c9e688db35eefb8c296afef54054e6785 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 25 Jun 2024 07:09:52 -0400 Subject: [PATCH 02/94] test workflow --- .github/workflows/publish.yml | 6 +++--- build.gradle | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f22d6807a..5527afe1f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,7 +33,7 @@ jobs: tag-release: permissions: contents: write - runs-on: ubuntu-22.04 + runs-on: self-hosted steps: - name: checkout uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: git push origin refs/tags/${{ inputs.tag }} build-java: - runs-on: ubuntu-22.04 + runs-on: self-hosted name: Release task steps: - name: Checkout code @@ -95,7 +95,7 @@ jobs: permissions: contents: write needs: build-java - runs-on: ubuntu-22.04 + runs-on: self-hosted steps: - name: checkout uses: actions/checkout@v4 diff --git a/build.gradle b/build.gradle index 5680ec1b1..9a9f69701 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 From 6f4b6081d52d6a734968db52c216309f3794a7c4 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 25 Jun 2024 07:13:50 -0400 Subject: [PATCH 03/94] test workflow --- .github/workflows/publish.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5527afe1f..be2805aef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -50,8 +50,12 @@ jobs: git push origin refs/tags/${{ inputs.tag }} build-java: - runs-on: self-hosted name: Release task + permissions: + contents: write + packages: write + needs: tag-release + runs-on: self-hosted steps: - name: Checkout code uses: actions/checkout@v4 From dfd10616ab946f17ded475aa1e5be468843e1f81 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 25 Jun 2024 07:16:51 -0400 Subject: [PATCH 04/94] post 1.0.0 release bump --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index d8c67589c..51f7e73a9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.22.0-SNAPSHOT +1.0.1-SNAPSHOT From 9a441c52e5b36b2b1fa4df79526aa8f52fc472ac Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 26 Jun 2024 07:09:24 -0400 Subject: [PATCH 05/94] test workflow --- .github/workflows/publish.yml | 63 +++++++++++++---------------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index be2805aef..5074b7a9b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,28 +3,23 @@ name: Publish a release to the Maven Central Repository on: workflow_dispatch: inputs: - patch: - description: Is patch? (Will only update tagged version.txt) - required: true - default: false - type: boolean release: description: Is release? (Will update master version.txt) required: true default: false type: boolean - tag: + tagged-version: description: Release Version (For tagged version.txt) required: true type: string - snapshot-tag: - description: New Version (For master version.txt) + new-version: + description: New Version (For branch version.txt) required: true type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: false env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' @@ -38,16 +33,19 @@ jobs: - name: checkout uses: actions/checkout@v4 with: - ref: ${{ github.sha }} - - name: Push Tag - id: commit-tag - if: ${{ inputs.release || inputs.patch }} + ref: ${{ github.ref }} + - name: update-tag + if: ${{ inputs.release }} run: | - echo ${{ inputs.tag }} > version.txt + git config user.name "github-actions" + git config user.email "github-actions" + echo ${{ inputs.tagged-version }} > version.txt + git add version.txt git status - git commit -am "${{ inputs.tag }} released." - git tag -f ${{ inputs.tag }} - git push origin refs/tags/${{ inputs.tag }} + git commit -m "${{ inputs.tagged-version }} released." + git tag ${{ inputs.tagged-version }} + git push + git push origin refs/tags/${{ inputs.tagged-version }} build-java: name: Release task @@ -60,23 +58,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ github.sha }} - - name: update-version - if: ${{ inputs.release || inputs.patch }} - run: | - echo ${{ inputs.tag }} > version.txt -# - 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') }} + ref: ${{ github.ref }} - name: Setup java uses: actions/setup-java@v4 with: @@ -104,11 +86,14 @@ jobs: - name: checkout uses: actions/checkout@v4 with: - ref: master - - name: Update master + ref: ${{ github.ref }} + - name: update-branch if: ${{ inputs.release }} run: | - echo ${{ inputs.snapshot-tag }} > version.txt + git config user.name "github-actions" + git config user.email "github-actions" + echo ${{ inputs.new-version }} > version.txt + git add version.txt git status - git commit -am "post ${{ inputs.tag }} release bump" - git push origin master \ No newline at end of file + git commit -m "${{ inputs.tagged-version }} released." + git push \ No newline at end of file From 883792883c9f91b9676d09f73c6d512124422ac9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Jun 2024 07:11:01 -0400 Subject: [PATCH 06/94] 7.7.7 released. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 51f7e73a9..0b854e4c3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.1-SNAPSHOT +7.7.7 From 89a6ad0fac7f18f074fd4d81f17a00265c75fac8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Jun 2024 07:11:52 -0400 Subject: [PATCH 07/94] 7.7.7 released. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 0b854e4c3..357179dda 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -7.7.7 +7.7.8-SNAPSHOT From a9fcb4a50cba8de5187d330498f89ff9e73095ff Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:28:36 -0400 Subject: [PATCH 08/94] test workflow --- .github/workflows/ci-low-cadence.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/codeql.yml | 1 + .github/workflows/post-publish.yml | 52 +++++++++++++++ .github/workflows/pre-publish.yml | 63 ++++++++++++++++++ .github/workflows/publish-ci.yml | 53 +++++++++++++++ .github/workflows/publish.yml | 97 +++++++++++++--------------- version.txt | 2 +- 8 files changed, 217 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/post-publish.yml create mode 100644 .github/workflows/pre-publish.yml create mode 100644 .github/workflows/publish-ci.yml diff --git a/.github/workflows/ci-low-cadence.yml b/.github/workflows/ci-low-cadence.yml index fbeedeabd..e1ac365e5 100644 --- a/.github/workflows/ci-low-cadence.yml +++ b/.github/workflows/ci-low-cadence.yml @@ -1,6 +1,7 @@ name: Continuous Integration (Low Cadence) on: + workflow_call: workflow_dispatch: repository_dispatch: types: run-slow-tests diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 632def8f4..4214cf325 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,7 @@ name: Continuous Integration on: + workflow_call: workflow_dispatch: push: branches: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 7ca911780..3d19dec9a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,6 +1,7 @@ name: "CodeQL" on: + workflow_call: workflow_dispatch: push: branches: diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml new file mode 100644 index 000000000..473a96caa --- /dev/null +++ b/.github/workflows/post-publish.yml @@ -0,0 +1,52 @@ +name: Post-publish tasks + +on: + workflow_call: + inputs: + release: + required: true + type: boolean + major-version: + required: true + type: number + minor-version: + required: true + type: number + patch-version: + required: true + type: number + +permissions: + contents: write + +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: false + +jobs: + manage-version: + name: Update branch version + runs-on: self-hosted + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.ref }} + - name: Commit snapshot version to current branch + id: commit-version + if: ${{ inputs.release }} + run: | + major=${{ inputs.major-version }} + minor=${{ inputs.minor-version }} + patch=${{ inputs.patch-version }} + let "patch_incr=patch+1" + let "snapshot_version=$major.$minor.$patch_incr-SNAPSHOT" + + git config user.name "github-actions" + git config user.email "github-actions@aeron.io" + echo $snapshot_version > version.txt + git add version.txt + git status + git commit -m "$snapshot_version version update." + git push diff --git a/.github/workflows/pre-publish.yml b/.github/workflows/pre-publish.yml new file mode 100644 index 000000000..aaea4d41c --- /dev/null +++ b/.github/workflows/pre-publish.yml @@ -0,0 +1,63 @@ +name: Pre-publish tasks + +on: + workflow_call: + inputs: + release: + required: true + type: boolean + major-version: + required: true + type: number + minor-version: + required: true + type: number + patch-version: + required: true + type: number + outputs: + sha: + description: Current SHA after version update + value: ${{ jobs.pre-publish.outputs.sha }} + +permissions: + contents: write + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + +jobs: + pre-publish: + name: Update version, tag repo, and return sha + runs-on: self-hosted + outputs: + sha: ${{ steps.return-sha.outputs.sha }} + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.ref }} + - name: Commit version to current branch + id: commit-version + if: ${{ inputs.release }} + run: | + git config user.name "github-actions" + git config user.email "github-actions@aeron.io" + echo ${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} > version.txt + git add version.txt + git status + git commit -m "${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} version update." + git push + - name: Tag branch + id: tag-branch + if: ${{ inputs.release }} + run: | + git tag ${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} + git push origin refs/tags/${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} + - name: Return current SHA + id: return-sha + run: | + git rev-parse HEAD + echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" \ No newline at end of file diff --git a/.github/workflows/publish-ci.yml b/.github/workflows/publish-ci.yml new file mode 100644 index 000000000..e7618436b --- /dev/null +++ b/.github/workflows/publish-ci.yml @@ -0,0 +1,53 @@ +name: release-ci + +on: + workflow_call: + inputs: + run-ci: + description: 'run the ci workflow' + required: true + type: boolean + + run-ci-low-cadence: + description: 'run the ci-low-cadence workflow' + required: true + type: boolean + + codeql: + description: 'run the ci-low-cadence workflow' + required: true + type: boolean + +jobs: + ci: + uses: ./.github/workflows/ci.yml + if: ${{ inputs.run-ci }} + + ci-skipped: + runs-on: ubuntu-latest + needs: ci + if: ${{ always() && needs.ci.result == 'skipped' }} + steps: + - run: echo CI Skipped + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + if: ${{ inputs.run-ci-low-cadence }} + + ci-low-cadence-skipped: + runs-on: ubuntu-latest + needs: ci-low-cadence + if: ${{ always() && needs.ci-low-cadence.result == 'skipped' }} + steps: + - run: echo CI Low Cadence Skipped + + codeql: + uses: ./.github/workflows/codeql.yml + if: ${{ inputs.codeql }} + + codeql-skipped: + runs-on: ubuntu-latest + needs: codeql + if: ${{ always() && needs.codeql.result == 'skipped' }} + steps: + - run: echo Codeql Skipped \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5074b7a9b..544d043b3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,19 +3,27 @@ name: Publish a release to the Maven Central Repository on: workflow_dispatch: inputs: + run-ci: + description: Run ci and test workflows + required: true + type: boolean release: - description: Is release? (Will update master version.txt) + description: Is release? (Will update tags and version) required: true default: false type: boolean - tagged-version: - description: Release Version (For tagged version.txt) + major-version: + description: Major release version + required: true + type: number + minor-version: + description: Minor release version required: true - type: string - new-version: - description: New Version (For branch version.txt) + type: number + patch-version: + description: Patch release version required: true - type: string + type: number concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -25,40 +33,36 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - tag-release: - permissions: - contents: write - runs-on: self-hosted - steps: - - name: checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: update-tag - if: ${{ inputs.release }} - run: | - git config user.name "github-actions" - git config user.email "github-actions" - echo ${{ inputs.tagged-version }} > version.txt - git add version.txt - git status - git commit -m "${{ inputs.tagged-version }} released." - git tag ${{ inputs.tagged-version }} - git push - git push origin refs/tags/${{ inputs.tagged-version }} + run-publish-ci: + name: Run ci workflows + uses: ./.github/workflows/publish-ci.yml + with: + run-ci: ${{ inputs.run-ci }} + run-ci-low-cadence: ${{ inputs.run-ci }} + codeql: ${{ inputs.run-ci }} + + pre-publish: + name: Update version, tag repo, and return sha + needs: run-release-ci + uses: ./.github/workflows/pre-publish.yml + with: + release: ${{ inputs.release }} + major-version: ${{ fromJson(inputs.major-version) }} + minor-version: ${{ fromJson(inputs.minor-version) }} + patch-version: ${{ fromJson(inputs.patch-version) }} - build-java: - name: Release task + publish: + name: Publish java artifacts permissions: contents: write packages: write - needs: tag-release + needs: pre-publish runs-on: self-hosted steps: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ github.ref }} + ref: ${{ needs.pre-publish.outputs.sha }} - name: Setup java uses: actions/setup-java@v4 with: @@ -77,23 +81,12 @@ jobs: OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - update-tags: - permissions: - contents: write - needs: build-java - runs-on: self-hosted - steps: - - name: checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: update-branch - if: ${{ inputs.release }} - run: | - git config user.name "github-actions" - git config user.email "github-actions" - echo ${{ inputs.new-version }} > version.txt - git add version.txt - git status - git commit -m "${{ inputs.tagged-version }} released." - git push \ No newline at end of file + post-publish: + uses: ./.github/workflows/post-publish.yml + needs: publish + with: + release: ${{ inputs.release }} + pre-build: false + major-version: ${{ fromJson(inputs.major-version) }} + minor-version: ${{ fromJson(inputs.minor-version) }} + patch-version: ${{ fromJson(inputs.patch-version) }} \ No newline at end of file diff --git a/version.txt b/version.txt index 357179dda..51f7e73a9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -7.7.8-SNAPSHOT +1.0.1-SNAPSHOT From c56a65100c461321831f1a58e88af6cf40c6cf81 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:33:02 -0400 Subject: [PATCH 09/94] test workflow --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 544d043b3..7bc9b68d5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -43,7 +43,7 @@ jobs: pre-publish: name: Update version, tag repo, and return sha - needs: run-release-ci + needs: run-publish-ci uses: ./.github/workflows/pre-publish.yml with: release: ${{ inputs.release }} From fd6a2d5030d5875a33e5e5425e2d3d5ef99b1136 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:33:39 -0400 Subject: [PATCH 10/94] test workflow --- .github/workflows/publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7bc9b68d5..b960f7c32 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -86,7 +86,6 @@ jobs: needs: publish with: release: ${{ inputs.release }} - pre-build: false major-version: ${{ fromJson(inputs.major-version) }} minor-version: ${{ fromJson(inputs.minor-version) }} patch-version: ${{ fromJson(inputs.patch-version) }} \ No newline at end of file From 9270ed9ac565d33e8bdd94268594de19d1825271 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:39:55 -0400 Subject: [PATCH 11/94] test workflow --- .github/workflows/post-publish.yml | 4 ---- .github/workflows/{publish-ci.yml => pre-publish-ci.yml} | 2 +- .github/workflows/pre-publish.yml | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) rename .github/workflows/{publish-ci.yml => pre-publish-ci.yml} (97%) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index 473a96caa..30b0333e1 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -19,10 +19,6 @@ on: permissions: contents: write -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: false - jobs: manage-version: name: Update branch version diff --git a/.github/workflows/publish-ci.yml b/.github/workflows/pre-publish-ci.yml similarity index 97% rename from .github/workflows/publish-ci.yml rename to .github/workflows/pre-publish-ci.yml index e7618436b..aee1258e6 100644 --- a/.github/workflows/publish-ci.yml +++ b/.github/workflows/pre-publish-ci.yml @@ -1,4 +1,4 @@ -name: release-ci +name: Pre-publish ci tasks on: workflow_call: diff --git a/.github/workflows/pre-publish.yml b/.github/workflows/pre-publish.yml index aaea4d41c..5f77cc35b 100644 --- a/.github/workflows/pre-publish.yml +++ b/.github/workflows/pre-publish.yml @@ -23,10 +23,6 @@ on: permissions: contents: write -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false - jobs: pre-publish: name: Update version, tag repo, and return sha From 597049b331e9e702e095f78d551e37086bfca898 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:45:58 -0400 Subject: [PATCH 12/94] test workflow --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b960f7c32..7c484ae74 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,7 +35,7 @@ env: jobs: run-publish-ci: name: Run ci workflows - uses: ./.github/workflows/publish-ci.yml + uses: ./.github/workflows/pre-publish-ci.yml with: run-ci: ${{ inputs.run-ci }} run-ci-low-cadence: ${{ inputs.run-ci }} @@ -82,8 +82,9 @@ jobs: OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} post-publish: - uses: ./.github/workflows/post-publish.yml + name: Update version needs: publish + uses: ./.github/workflows/post-publish.yml with: release: ${{ inputs.release }} major-version: ${{ fromJson(inputs.major-version) }} From f7eb92234da70a3041b10247e9f04bc9a9a02f22 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 10:47:30 -0400 Subject: [PATCH 13/94] 0.0.0 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 51f7e73a9..77d6f4ca2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.1-SNAPSHOT +0.0.0 From 6fffa421faa0bf89e64a896b0f123a7b13cd9c11 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 10:50:04 -0400 Subject: [PATCH 14/94] 0.0.1 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 77d6f4ca2..8acdd82b7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.0 +0.0.1 From 361ad64addeb1d28050262a022c11bc1ee4193f6 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:54:38 -0400 Subject: [PATCH 15/94] test workflow --- .github/workflows/post-publish.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index 30b0333e1..9a3e98456 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -1,6 +1,24 @@ name: Post-publish tasks on: + workflow_dispatch: + inputs: + release: + required: true + description: a + type: boolean + major-version: + required: true + description: b + type: number + minor-version: + required: true + description: c + type: number + patch-version: + required: true + description: d + type: number workflow_call: inputs: release: From 902ed5cc8ba6d23e87c47f4e22d3575a0cf58091 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:56:00 -0400 Subject: [PATCH 16/94] test workflow --- .github/workflows/post-publish.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index 9a3e98456..3506fc2cb 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -57,10 +57,12 @@ jobs: let "patch_incr=patch+1" let "snapshot_version=$major.$minor.$patch_incr-SNAPSHOT" - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo $snapshot_version > version.txt - git add version.txt - git status - git commit -m "$snapshot_version version update." - git push + echo "$snapshot_version" + +# git config user.name "github-actions" +# git config user.email "github-actions@aeron.io" +# echo $snapshot_version > version.txt +# git add version.txt +# git status +# git commit -m "$snapshot_version version update." +# git push From 80962bd33130a8a2cb8d764eab1c86674ef7ea9f Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:56:54 -0400 Subject: [PATCH 17/94] test workflow --- .github/workflows/post-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index 3506fc2cb..f414ab4ec 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -57,7 +57,7 @@ jobs: let "patch_incr=patch+1" let "snapshot_version=$major.$minor.$patch_incr-SNAPSHOT" - echo "$snapshot_version" + echo "snapshot_version" # git config user.name "github-actions" # git config user.email "github-actions@aeron.io" From b3acd8539b535c8b6b833617ce7d2988903d6859 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:57:34 -0400 Subject: [PATCH 18/94] test workflow --- .github/workflows/post-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index f414ab4ec..e9b434b00 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -57,7 +57,7 @@ jobs: let "patch_incr=patch+1" let "snapshot_version=$major.$minor.$patch_incr-SNAPSHOT" - echo "snapshot_version" + echo $snapshot_version # git config user.name "github-actions" # git config user.email "github-actions@aeron.io" From 1cbd012f9a0bc30bfdbf46dde094bd57c814222f Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 10:59:03 -0400 Subject: [PATCH 19/94] test workflow --- .github/workflows/post-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index e9b434b00..379e276f0 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -55,9 +55,9 @@ jobs: minor=${{ inputs.minor-version }} patch=${{ inputs.patch-version }} let "patch_incr=patch+1" - let "snapshot_version=$major.$minor.$patch_incr-SNAPSHOT" + SNAPSHOT_VERSION="$major.$minor.$patch_incr-SNAPSHOT" - echo $snapshot_version + echo $SNAPSHOT_VERSION # git config user.name "github-actions" # git config user.email "github-actions@aeron.io" From 785a4b43a516c8a895e5951c0ecd7eff7188a4f2 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 11:16:49 -0400 Subject: [PATCH 20/94] publish --- .github/workflows/post-publish.yml | 52 ++++++------------------------ .github/workflows/pre-publish.yml | 34 ++++++++----------- .github/workflows/publish.yml | 24 +++++--------- 3 files changed, 32 insertions(+), 78 deletions(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index 379e276f0..e1651be5f 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -1,38 +1,14 @@ name: Post-publish tasks on: - workflow_dispatch: - inputs: - release: - required: true - description: a - type: boolean - major-version: - required: true - description: b - type: number - minor-version: - required: true - description: c - type: number - patch-version: - required: true - description: d - type: number workflow_call: inputs: release: required: true type: boolean - major-version: - required: true - type: number - minor-version: - required: true - type: number - patch-version: + version: required: true - type: number + type: string permissions: contents: write @@ -50,19 +26,11 @@ jobs: - name: Commit snapshot version to current branch id: commit-version if: ${{ inputs.release }} - run: | - major=${{ inputs.major-version }} - minor=${{ inputs.minor-version }} - patch=${{ inputs.patch-version }} - let "patch_incr=patch+1" - SNAPSHOT_VERSION="$major.$minor.$patch_incr-SNAPSHOT" - - echo $SNAPSHOT_VERSION - -# git config user.name "github-actions" -# git config user.email "github-actions@aeron.io" -# echo $snapshot_version > version.txt -# git add version.txt -# git status -# git commit -m "$snapshot_version version update." -# git push + run: | + git config user.name "github-actions" + git config user.email "github-actions@aeron.io" + echo ${{ inputs.version }}-SNAPSHOT > version.txt + git add version.txt + git status + git commit -m "${{ inputs.version }}-SNAPSHOT version update." + git push diff --git a/.github/workflows/pre-publish.yml b/.github/workflows/pre-publish.yml index 5f77cc35b..16b11f117 100644 --- a/.github/workflows/pre-publish.yml +++ b/.github/workflows/pre-publish.yml @@ -6,15 +6,9 @@ on: release: required: true type: boolean - major-version: + version: required: true - type: number - minor-version: - required: true - type: number - patch-version: - required: true - type: number + type: string outputs: sha: description: Current SHA after version update @@ -30,30 +24,30 @@ jobs: outputs: sha: ${{ steps.return-sha.outputs.sha }} steps: - - name: Checkout - id: checkout + - id: checkout + name: Checkout uses: actions/checkout@v4 with: ref: ${{ github.ref }} - - name: Commit version to current branch - id: commit-version + - id: commit-version if: ${{ inputs.release }} + name: Commit version to current branch run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" - echo ${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} > version.txt + echo ${{ inputs.version }} > version.txt git add version.txt git status - git commit -m "${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} version update." + git commit -m "${{ inputs.version }} version update." git push - - name: Tag branch - id: tag-branch + - id: tag-branch if: ${{ inputs.release }} + name: Tag branch run: | - git tag ${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} - git push origin refs/tags/${{ inputs.major-version }}.${{ inputs.minor-version }}.${{ inputs.patch-version }} - - name: Return current SHA - id: return-sha + git tag ${{ inputs.version }} + git push origin refs/tags/${{ inputs.version }} + - id: return-sha + name: Return current SHA run: | git rev-parse HEAD echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7c484ae74..6db9d9719 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,18 +12,14 @@ on: required: true default: false type: boolean - major-version: - description: Major release version + publish-version: + description: Published version (x.y.z) required: true - type: number - minor-version: - description: Minor release version + type: string + next-version: + description: Next version (x.y.z) required: true - type: number - patch-version: - description: Patch release version - required: true - type: number + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -47,9 +43,7 @@ jobs: uses: ./.github/workflows/pre-publish.yml with: release: ${{ inputs.release }} - major-version: ${{ fromJson(inputs.major-version) }} - minor-version: ${{ fromJson(inputs.minor-version) }} - patch-version: ${{ fromJson(inputs.patch-version) }} + version: ${{ inputs.version }} publish: name: Publish java artifacts @@ -87,6 +81,4 @@ jobs: uses: ./.github/workflows/post-publish.yml with: release: ${{ inputs.release }} - major-version: ${{ fromJson(inputs.major-version) }} - minor-version: ${{ fromJson(inputs.minor-version) }} - patch-version: ${{ fromJson(inputs.patch-version) }} \ No newline at end of file + version: ${{ inputs.next-version }} \ No newline at end of file From 740edb379439d375e284e34f18b37e1415013e7b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:18:00 -0400 Subject: [PATCH 21/94] version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 8acdd82b7..8b1378917 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.1 + From a72a9b2392a18fca76f3f696b7df88168f3b18ce Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 11:19:59 -0400 Subject: [PATCH 22/94] publish --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6db9d9719..fe0c4b32f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -43,7 +43,7 @@ jobs: uses: ./.github/workflows/pre-publish.yml with: release: ${{ inputs.release }} - version: ${{ inputs.version }} + version: ${{ inputs.publish-version }} publish: name: Publish java artifacts From 9f0fbe9d652bf77ccae0c887d043c3d0e8435542 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:20:52 -0400 Subject: [PATCH 23/94] 0.0.0 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 8b1378917..77d6f4ca2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ - +0.0.0 From 4cb6ef4df51b5d9e4ca382c2454d8d22d6b3f72f Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:21:44 -0400 Subject: [PATCH 24/94] 0.0.1 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 77d6f4ca2..8acdd82b7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.0 +0.0.1 From 8bed11a323732ca3547caad5ca66bd567634653f Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 11:22:35 -0400 Subject: [PATCH 25/94] publish --- .github/workflows/post-publish.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-publish.yml index e1651be5f..5f6fed049 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-publish.yml @@ -14,17 +14,15 @@ permissions: contents: write jobs: - manage-version: - name: Update branch version + post-publish: + name: Update version runs-on: self-hosted steps: - name: Checkout - id: checkout uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Commit snapshot version to current branch - id: commit-version if: ${{ inputs.release }} run: | git config user.name "github-actions" From 3b03a570b5b6e5815ed886912ae961217e315f99 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:25:14 -0400 Subject: [PATCH 26/94] 0.0.2 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 8acdd82b7..4e379d2bf 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.1 +0.0.2 From b665a04333b28039eb220f55f93e44670cde77b6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:26:09 -0400 Subject: [PATCH 27/94] 0.1.0-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 4e379d2bf..b694fe3f6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.2 +0.1.0-SNAPSHOT From e775cac4ca5f308203411af29239fa9c01c45b02 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 11:28:18 -0400 Subject: [PATCH 28/94] publish --- .github/workflows/pre-publish-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-publish-ci.yml b/.github/workflows/pre-publish-ci.yml index aee1258e6..ebd195c01 100644 --- a/.github/workflows/pre-publish-ci.yml +++ b/.github/workflows/pre-publish-ci.yml @@ -14,7 +14,7 @@ on: type: boolean codeql: - description: 'run the ci-low-cadence workflow' + description: 'run the codeql workflow' required: true type: boolean From 6540a4b49ba2f737aff5a334895a5fc97df71b20 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Sun, 30 Jun 2024 11:46:06 -0400 Subject: [PATCH 29/94] publish --- .../{post-publish.yml => post-release.yml} | 2 +- ...{pre-publish-ci.yml => pre-release-ci.yml} | 2 +- .../{pre-publish.yml => pre-release.yml} | 2 +- .../workflows/{publish.yml => release.yml} | 32 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) rename .github/workflows/{post-publish.yml => post-release.yml} (96%) rename .github/workflows/{pre-publish-ci.yml => pre-release-ci.yml} (97%) rename .github/workflows/{pre-publish.yml => pre-release.yml} (98%) rename .github/workflows/{publish.yml => release.yml} (78%) diff --git a/.github/workflows/post-publish.yml b/.github/workflows/post-release.yml similarity index 96% rename from .github/workflows/post-publish.yml rename to .github/workflows/post-release.yml index 5f6fed049..93d85e0aa 100644 --- a/.github/workflows/post-publish.yml +++ b/.github/workflows/post-release.yml @@ -1,4 +1,4 @@ -name: Post-publish tasks +name: Post-release tasks on: workflow_call: diff --git a/.github/workflows/pre-publish-ci.yml b/.github/workflows/pre-release-ci.yml similarity index 97% rename from .github/workflows/pre-publish-ci.yml rename to .github/workflows/pre-release-ci.yml index ebd195c01..54167b3d9 100644 --- a/.github/workflows/pre-publish-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -1,4 +1,4 @@ -name: Pre-publish ci tasks +name: Pre-release ci tasks on: workflow_call: diff --git a/.github/workflows/pre-publish.yml b/.github/workflows/pre-release.yml similarity index 98% rename from .github/workflows/pre-publish.yml rename to .github/workflows/pre-release.yml index 16b11f117..c864a5346 100644 --- a/.github/workflows/pre-publish.yml +++ b/.github/workflows/pre-release.yml @@ -1,4 +1,4 @@ -name: Pre-publish tasks +name: Pre-release tasks on: workflow_call: diff --git a/.github/workflows/publish.yml b/.github/workflows/release.yml similarity index 78% rename from .github/workflows/publish.yml rename to .github/workflows/release.yml index fe0c4b32f..c7cd9c87a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Publish a release to the Maven Central Repository +name: Release to Maven Central Repository on: workflow_dispatch: @@ -12,8 +12,8 @@ on: required: true default: false type: boolean - publish-version: - description: Published version (x.y.z) + release-version: + description: Released version (x.y.z) required: true type: string next-version: @@ -29,34 +29,34 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - run-publish-ci: + run-release-ci: name: Run ci workflows - uses: ./.github/workflows/pre-publish-ci.yml + uses: ./.github/workflows/pre-release-ci.yml with: run-ci: ${{ inputs.run-ci }} run-ci-low-cadence: ${{ inputs.run-ci }} codeql: ${{ inputs.run-ci }} - pre-publish: + pre-release: name: Update version, tag repo, and return sha - needs: run-publish-ci - uses: ./.github/workflows/pre-publish.yml + needs: run-release-ci + uses: ./.github/workflows/pre-release.yml with: release: ${{ inputs.release }} - version: ${{ inputs.publish-version }} + version: ${{ inputs.release-version }} - publish: - name: Publish java artifacts + release: + name: Release java artifacts permissions: contents: write packages: write - needs: pre-publish + needs: pre-release runs-on: self-hosted steps: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ needs.pre-publish.outputs.sha }} + ref: ${{ needs.pre-release.outputs.sha }} - name: Setup java uses: actions/setup-java@v4 with: @@ -75,10 +75,10 @@ jobs: OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - post-publish: + post-release: name: Update version - needs: publish - uses: ./.github/workflows/post-publish.yml + needs: release + uses: ./.github/workflows/post-release.yml with: release: ${{ inputs.release }} version: ${{ inputs.next-version }} \ No newline at end of file From 3a91b02455416ff748bf2215733fbe30fb07f5ed Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:47:04 -0400 Subject: [PATCH 30/94] 0.1.0 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index b694fe3f6..6e8bf73aa 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.1.0-SNAPSHOT +0.1.0 From e2f47d9cb4f7a1bf324b0233dd766c151db427dc Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 30 Jun 2024 11:48:04 -0400 Subject: [PATCH 31/94] 0.2.0-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 6e8bf73aa..d144648c3 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.1.0 +0.2.0-SNAPSHOT From 8fea7a68a2f51bd54fb073cbe24a54ffc126c0f6 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 13:51:46 -0400 Subject: [PATCH 32/94] publish --- .github/workflows/pre-release-ci.yml | 53 ---------------------------- .github/workflows/release.yml | 26 +++++--------- 2 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/pre-release-ci.yml diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml deleted file mode 100644 index 54167b3d9..000000000 --- a/.github/workflows/pre-release-ci.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Pre-release ci tasks - -on: - workflow_call: - inputs: - run-ci: - description: 'run the ci workflow' - required: true - type: boolean - - run-ci-low-cadence: - description: 'run the ci-low-cadence workflow' - required: true - type: boolean - - codeql: - description: 'run the codeql workflow' - required: true - type: boolean - -jobs: - ci: - uses: ./.github/workflows/ci.yml - if: ${{ inputs.run-ci }} - - ci-skipped: - runs-on: ubuntu-latest - needs: ci - if: ${{ always() && needs.ci.result == 'skipped' }} - steps: - - run: echo CI Skipped - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - if: ${{ inputs.run-ci-low-cadence }} - - ci-low-cadence-skipped: - runs-on: ubuntu-latest - needs: ci-low-cadence - if: ${{ always() && needs.ci-low-cadence.result == 'skipped' }} - steps: - - run: echo CI Low Cadence Skipped - - codeql: - uses: ./.github/workflows/codeql.yml - if: ${{ inputs.codeql }} - - codeql-skipped: - runs-on: ubuntu-latest - needs: codeql - if: ${{ always() && needs.codeql.result == 'skipped' }} - steps: - - run: echo Codeql Skipped \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7cd9c87a..b5af1638c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,10 +3,6 @@ name: Release to Maven Central Repository on: workflow_dispatch: inputs: - run-ci: - description: Run ci and test workflows - required: true - type: boolean release: description: Is release? (Will update tags and version) required: true @@ -29,17 +25,18 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - run-release-ci: - name: Run ci workflows - uses: ./.github/workflows/pre-release-ci.yml - with: - run-ci: ${{ inputs.run-ci }} - run-ci-low-cadence: ${{ inputs.run-ci }} - codeql: ${{ inputs.run-ci }} + ci: + uses: ./.github/workflows/ci.yml + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + + codeql: + uses: ./.github/workflows/codeql.yml pre-release: name: Update version, tag repo, and return sha - needs: run-release-ci + needs: [ ci, ci-low-cadence, codeql] uses: ./.github/workflows/pre-release.yml with: release: ${{ inputs.release }} @@ -62,11 +59,6 @@ jobs: with: distribution: 'zulu' java-version: 8 - - name: Setup BUILD_JAVA_HOME & BUILD_JAVA_VERSION - run: | - java -Xinternalversion - echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV - echo "BUILD_JAVA_VERSION=8" >> $GITHUB_ENV - name: Publish a release run: ./gradlew publish env: From 76b67c43cef727d4ed4f160acf27ec6dd4a70ba7 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 13:55:32 -0400 Subject: [PATCH 33/94] publish --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5af1638c..55ce1139b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,10 @@ -name: Release to Maven Central Repository +name: Release on: workflow_dispatch: inputs: release: - description: Is release? (Will update tags and version) + description: Is release? (Will create tag and update version) required: true default: false type: boolean From 104f3f5af8628f562d5df0844ce072c738824396 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 14:10:30 -0400 Subject: [PATCH 34/94] publish --- .github/workflows/release.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55ce1139b..44ae12f9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,16 +27,25 @@ env: jobs: ci: uses: ./.github/workflows/ci.yml + concurrency: + group: ci-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false ci-low-cadence: uses: ./.github/workflows/ci-low-cadence.yml + concurrency: + group: ci-low-cadence-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false codeql: uses: ./.github/workflows/codeql.yml + concurrency: + group: codeql-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false pre-release: name: Update version, tag repo, and return sha - needs: [ ci, ci-low-cadence, codeql] + needs: [ ci, ci-low-cadence, codeql ] uses: ./.github/workflows/pre-release.yml with: release: ${{ inputs.release }} From bd488ff457e30f4857d657b8e764813190409053 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 14:12:19 -0400 Subject: [PATCH 35/94] debugging --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44ae12f9d..69961f978 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,7 @@ concurrency: cancel-in-progress: false env: + ACTIONS_STEP_DEBUG: true GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: From 2de066f6a89f4351ae2d5efeb4b9643ecb67c18d Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 14:13:38 -0400 Subject: [PATCH 36/94] debugging --- .github/workflows/ci-low-cadence.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/release.yml | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-low-cadence.yml b/.github/workflows/ci-low-cadence.yml index e1ac365e5..04b063249 100644 --- a/.github/workflows/ci-low-cadence.yml +++ b/.github/workflows/ci-low-cadence.yml @@ -9,7 +9,7 @@ on: - cron: '0 0,12 * * *' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ci-low-cadence-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true env: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4214cf325..1d2cfc7c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ on: - 'release/**' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ci-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true env: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3d19dec9a..9de527eb9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,7 +14,7 @@ on: - release/** concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: codeql-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69961f978..707fbf9f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,21 +28,12 @@ env: jobs: ci: uses: ./.github/workflows/ci.yml - concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false ci-low-cadence: uses: ./.github/workflows/ci-low-cadence.yml - concurrency: - group: ci-low-cadence-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false codeql: uses: ./.github/workflows/codeql.yml - concurrency: - group: codeql-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: false pre-release: name: Update version, tag repo, and return sha From 41365e6e93ab89215a4e518eccc4c55102290574 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 15:11:09 -0400 Subject: [PATCH 37/94] only use sha? --- .github/workflows/pre-release.yml | 12 +++--------- .github/workflows/release.yml | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index c864a5346..ced8aecde 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -28,22 +28,16 @@ jobs: name: Checkout uses: actions/checkout@v4 with: - ref: ${{ github.ref }} - - id: commit-version + ref: ${{ github.sha }} + - id: tag-version if: ${{ inputs.release }} - name: Commit version to current branch + name: Update version, tag repo, and return current SHA run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" echo ${{ inputs.version }} > version.txt git add version.txt - git status git commit -m "${{ inputs.version }} version update." - git push - - id: tag-branch - if: ${{ inputs.release }} - name: Tag branch - run: | git tag ${{ inputs.version }} git push origin refs/tags/${{ inputs.version }} - id: return-sha diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 707fbf9f7..3527b7749 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,6 @@ concurrency: cancel-in-progress: false env: - ACTIONS_STEP_DEBUG: true GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: From 39e39b8c5e9b74513b34d1abb2d067b041796d63 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 Jul 2024 16:15:31 -0400 Subject: [PATCH 38/94] 0.2.0 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index d144648c3..0ea3a944b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.2.0-SNAPSHOT +0.2.0 From a19dc541cc777e442709cbea3b28949d40acd57e Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 Jul 2024 16:16:19 -0400 Subject: [PATCH 39/94] 0.3.0-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 0ea3a944b..daf2bb73d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.2.0 +0.3.0-SNAPSHOT From 17ecd007ad72a8cd75064cc10f36c703449cfb16 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:19:15 -0400 Subject: [PATCH 40/94] only use sha? --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3527b7749..8e3904695 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,18 +25,18 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - - codeql: - uses: ./.github/workflows/codeql.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml +# +# codeql: +# uses: ./.github/workflows/codeql.yml pre-release: name: Update version, tag repo, and return sha - needs: [ ci, ci-low-cadence, codeql ] +# needs: [ ci, ci-low-cadence, codeql ] uses: ./.github/workflows/pre-release.yml with: release: ${{ inputs.release }} From 8123a1abe65b11bd85a9f12a6480ba012e2fbf97 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 Jul 2024 16:21:55 -0400 Subject: [PATCH 41/94] 10.10.3-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index daf2bb73d..4c7f8f4e1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.3.0-SNAPSHOT +10.10.3-SNAPSHOT From 3ae4f0be9e31a248f8525c1a3732cc4831eae0e3 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:44:09 -0400 Subject: [PATCH 42/94] only use sha? --- .github/workflows/pre-release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ced8aecde..ad1d3eeeb 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -35,6 +35,10 @@ jobs: run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" + + git branch gha-${{ inputs.version }} + git switch gha-${{ inputs.version }} + echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." From c5269bf7109f9dd8d7da33c1692b3e4137a4c49b Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:45:19 -0400 Subject: [PATCH 43/94] only use sha? --- .github/workflows/pre-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ad1d3eeeb..338ddcc6f 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,8 +42,8 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git tag ${{ inputs.version }} - git push origin refs/tags/${{ inputs.version }} + git tag -f ${{ inputs.version }} + git push -f origin refs/tags/${{ inputs.version }} - id: return-sha name: Return current SHA run: | From 7da3c292023be439289e45b6c7d947849ca0d174 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 1 Jul 2024 16:46:24 -0400 Subject: [PATCH 44/94] 0.0.1-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 4c7f8f4e1..cfefe08c7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -10.10.3-SNAPSHOT +0.0.1-SNAPSHOT From 640820363ba26db570dc7eb6eaa6d461d4d9c378 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:48:11 -0400 Subject: [PATCH 45/94] only use sha? --- .github/workflows/pre-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 338ddcc6f..b8dc3a30a 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,6 +42,8 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." + git push + git tag -f ${{ inputs.version }} git push -f origin refs/tags/${{ inputs.version }} - id: return-sha From e4933adfc72d51f314ce1594a37f4c2235d0d38f Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:49:51 -0400 Subject: [PATCH 46/94] only use sha? --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index b8dc3a30a..5d1082a78 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,7 +42,7 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git push + git push -u origin git tag -f ${{ inputs.version }} git push -f origin refs/tags/${{ inputs.version }} From 406922803d02d0c640972c8fb18ab3dcfd2f6f69 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:56:27 -0400 Subject: [PATCH 47/94] only use sha? --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 5d1082a78..a161d8851 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,7 +42,7 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git push -u origin + git push origin git tag -f ${{ inputs.version }} git push -f origin refs/tags/${{ inputs.version }} From f414da80716a4ec5fae8edc197c7d88327018966 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:57:24 -0400 Subject: [PATCH 48/94] only use sha? --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index a161d8851..6ed866e11 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -42,7 +42,7 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git push origin + git push --set-upstream origin git tag -f ${{ inputs.version }} git push -f origin refs/tags/${{ inputs.version }} From 7ec71732721dfcbaa73174b68991ef659f64a66b Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 16:59:31 -0400 Subject: [PATCH 49/94] only use sha? --- .github/workflows/pre-release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 6ed866e11..1570f68d8 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -36,13 +36,15 @@ jobs: git config user.name "github-actions" git config user.email "github-actions@aeron.io" - git branch gha-${{ inputs.version }} - git switch gha-${{ inputs.version }} + new_branch = gha-${{ inputs.version }} + + git branch $new_branch + git switch $new_branch echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git push --set-upstream origin + git push --set-upstream origin $new_branch git tag -f ${{ inputs.version }} git push -f origin refs/tags/${{ inputs.version }} From ea5995a759a9e5543ab5620d3b3c89448e2ead1d Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 17:28:21 -0400 Subject: [PATCH 50/94] only use sha? --- .github/workflows/pre-release.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 1570f68d8..ced8aecde 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -35,19 +35,11 @@ jobs: run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" - - new_branch = gha-${{ inputs.version }} - - git branch $new_branch - git switch $new_branch - echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." - git push --set-upstream origin $new_branch - - git tag -f ${{ inputs.version }} - git push -f origin refs/tags/${{ inputs.version }} + git tag ${{ inputs.version }} + git push origin refs/tags/${{ inputs.version }} - id: return-sha name: Return current SHA run: | From bbec4171bd82be71767e325d9e974a2a10a8bada Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 17:39:00 -0400 Subject: [PATCH 51/94] only use sha? --- .github/workflows/pre-release.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ced8aecde..6c801f11f 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -28,11 +28,18 @@ jobs: name: Checkout uses: actions/checkout@v4 with: - ref: ${{ github.sha }} + ref: ${{ github.ref }} + - id: validate + name: Validate no new commits + run: | + current_sha=$(git rev-parse HEAD) + if test $current_sha != '${{ github.sha }}' + then exit 1 + fi - id: tag-version if: ${{ inputs.release }} name: Update version, tag repo, and return current SHA - run: | + run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" echo ${{ inputs.version }} > version.txt From 81427a4282ced676f2462602e72e8b9977bd1d52 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Mon, 1 Jul 2024 17:40:17 -0400 Subject: [PATCH 52/94] only use sha? --- .github/workflows/pre-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 6c801f11f..1eac42361 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -33,7 +33,7 @@ jobs: name: Validate no new commits run: | current_sha=$(git rev-parse HEAD) - if test $current_sha != '${{ github.sha }}' + if test $current_sha = '${{ github.sha }}' then exit 1 fi - id: tag-version From 0a58210f7f621011a2a7c08095cb50335f2fc9bc Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 2 Jul 2024 06:27:22 -0400 Subject: [PATCH 53/94] only use sha? --- .github/workflows/pre-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 1eac42361..99b10d09f 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -33,7 +33,7 @@ jobs: name: Validate no new commits run: | current_sha=$(git rev-parse HEAD) - if test $current_sha = '${{ github.sha }}' + if test $current_sha != '${{ github.sha }}' then exit 1 fi - id: tag-version @@ -45,6 +45,7 @@ jobs: echo ${{ inputs.version }} > version.txt git add version.txt git commit -m "${{ inputs.version }} version update." + git push git tag ${{ inputs.version }} git push origin refs/tags/${{ inputs.version }} - id: return-sha From d0110fa163e587591e822fedade32331120b5bae Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Tue, 2 Jul 2024 06:33:18 -0400 Subject: [PATCH 54/94] only use sha? --- .github/workflows/release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e3904695..76b433503 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,18 +25,18 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: -# ci: -# uses: ./.github/workflows/ci.yml -# -# ci-low-cadence: -# uses: ./.github/workflows/ci-low-cadence.yml -# -# codeql: -# uses: ./.github/workflows/codeql.yml + ci: + uses: ./.github/workflows/ci.yml + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + + codeql: + uses: ./.github/workflows/codeql.yml pre-release: name: Update version, tag repo, and return sha -# needs: [ ci, ci-low-cadence, codeql ] + needs: [ ci, ci-low-cadence, codeql ] uses: ./.github/workflows/pre-release.yml with: release: ${{ inputs.release }} @@ -45,7 +45,7 @@ jobs: release: name: Release java artifacts permissions: - contents: write + contents: read packages: write needs: pre-release runs-on: self-hosted From 20ee2b21a95f6edb94e16d91c91adcae4d89e859 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:06:25 -0400 Subject: [PATCH 55/94] only use sha? --- .github/workflows/post-release.yml | 34 ------------------ .github/workflows/pre-release.yml | 55 ------------------------------ .github/workflows/release.yml | 48 ++++++-------------------- 3 files changed, 11 insertions(+), 126 deletions(-) delete mode 100644 .github/workflows/post-release.yml delete mode 100644 .github/workflows/pre-release.yml diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml deleted file mode 100644 index 93d85e0aa..000000000 --- a/.github/workflows/post-release.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Post-release tasks - -on: - workflow_call: - inputs: - release: - required: true - type: boolean - version: - required: true - type: string - -permissions: - contents: write - -jobs: - post-publish: - name: Update version - runs-on: self-hosted - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: Commit snapshot version to current branch - if: ${{ inputs.release }} - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.version }}-SNAPSHOT > version.txt - git add version.txt - git status - git commit -m "${{ inputs.version }}-SNAPSHOT version update." - git push diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml deleted file mode 100644 index 99b10d09f..000000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Pre-release tasks - -on: - workflow_call: - inputs: - release: - required: true - type: boolean - version: - required: true - type: string - outputs: - sha: - description: Current SHA after version update - value: ${{ jobs.pre-publish.outputs.sha }} - -permissions: - contents: write - -jobs: - pre-publish: - name: Update version, tag repo, and return sha - runs-on: self-hosted - outputs: - sha: ${{ steps.return-sha.outputs.sha }} - steps: - - id: checkout - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - id: validate - name: Validate no new commits - run: | - current_sha=$(git rev-parse HEAD) - if test $current_sha != '${{ github.sha }}' - then exit 1 - fi - - id: tag-version - if: ${{ inputs.release }} - name: Update version, tag repo, and return current SHA - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.version }} > version.txt - git add version.txt - git commit -m "${{ inputs.version }} version update." - git push - git tag ${{ inputs.version }} - git push origin refs/tags/${{ inputs.version }} - - id: return-sha - name: Return current SHA - run: | - git rev-parse HEAD - echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76b433503..ba90d6c66 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,20 +2,9 @@ name: Release on: workflow_dispatch: - inputs: - release: - description: Is release? (Will create tag and update version) - required: true - default: false - type: boolean - release-version: - description: Released version (x.y.z) - required: true - type: string - next-version: - description: Next version (x.y.z) - required: true - type: string + push: + tags: + - '*' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -25,29 +14,22 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml codeql: uses: ./.github/workflows/codeql.yml - pre-release: - name: Update version, tag repo, and return sha - needs: [ ci, ci-low-cadence, codeql ] - uses: ./.github/workflows/pre-release.yml - with: - release: ${{ inputs.release }} - version: ${{ inputs.release-version }} - release: name: Release java artifacts permissions: contents: read packages: write - needs: pre-release +# needs: [ ci, ci-low-cadence, codeql ] + needs: codeql runs-on: self-hosted steps: - name: Checkout code @@ -65,12 +47,4 @@ jobs: SIGNING_GPG_SECRET_KEY: ${{ secrets.signingKey }} SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} OSSRH_USERNAME: ${{ secrets.ossrhUsername }} - OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - - post-release: - name: Update version - needs: release - uses: ./.github/workflows/post-release.yml - with: - release: ${{ inputs.release }} - version: ${{ inputs.next-version }} \ No newline at end of file + OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} \ No newline at end of file From fb9c8acdf94a3b1186574dc00b1fc1d5fe2f44a7 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:08:45 -0400 Subject: [PATCH 56/94] 2.2.2 release --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index cfefe08c7..b1b25a5ff 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.0.1-SNAPSHOT +2.2.2 From c4ba0b62e65bae7b1c4844d1b6621df3ea9e6e23 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:09:26 -0400 Subject: [PATCH 57/94] 2.2.3-SNAPSHOT --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index b1b25a5ff..17dbf66a6 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.2 +2.2.3-SNAPSHOT From b4aa7e94907a9fa472b201295fef26f09458e69a Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:17:22 -0400 Subject: [PATCH 58/94] only use sha? --- .github/workflows/release.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba90d6c66..82cb9c133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,11 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: -# ci: -# uses: ./.github/workflows/ci.yml -# -# ci-low-cadence: -# uses: ./.github/workflows/ci-low-cadence.yml + ci: + uses: ./.github/workflows/ci.yml + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml codeql: uses: ./.github/workflows/codeql.yml @@ -28,14 +28,13 @@ jobs: permissions: contents: read packages: write -# needs: [ ci, ci-low-cadence, codeql ] - needs: codeql + needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ needs.pre-release.outputs.sha }} + ref: ${{ github.sha }} - name: Setup java uses: actions/setup-java@v4 with: From 5a2bfc497c143fe00317b439fdb0b31ee090d5e5 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:18:01 -0400 Subject: [PATCH 59/94] 2.2.3 released --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 17dbf66a6..585940699 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.3-SNAPSHOT +2.2.3 From 2e6bfe0561c86f05ca673df3a17d8c5ddb4d3594 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:27:19 -0400 Subject: [PATCH 60/94] only use sha? --- .github/workflows/release.yml | 21 +++++++++------------ version.txt | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82cb9c133..12358378d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,9 +2,6 @@ name: Release on: workflow_dispatch: - push: - tags: - - '*' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -14,21 +11,21 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - - codeql: - uses: ./.github/workflows/codeql.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml +# +# codeql: +# uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: read packages: write - needs: [ ci, ci-low-cadence, codeql ] +# needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code diff --git a/version.txt b/version.txt index 585940699..530cdd91a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.3 +2.2.4 From 9ebeba9911007c48d462eecbae3cab2d27b74df6 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Wed, 3 Jul 2024 05:27:54 -0400 Subject: [PATCH 61/94] 2.2.5-SNAPSHOT --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 530cdd91a..bfb11cb69 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.4 +2.2.5-SNAPSHOT From 990fbfc5cab9aae9bf5d7c161a37107a187a3af4 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 4 Jul 2024 16:21:27 -0400 Subject: [PATCH 62/94] only use sha? --- .github/workflows/post-release.yml | 34 ----------------- .github/workflows/pre-release.yml | 55 --------------------------- .github/workflows/release.yml | 61 ++++++++++++++++++++++++++---- 3 files changed, 53 insertions(+), 97 deletions(-) delete mode 100644 .github/workflows/post-release.yml delete mode 100644 .github/workflows/pre-release.yml diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml deleted file mode 100644 index 93d85e0aa..000000000 --- a/.github/workflows/post-release.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Post-release tasks - -on: - workflow_call: - inputs: - release: - required: true - type: boolean - version: - required: true - type: string - -permissions: - contents: write - -jobs: - post-publish: - name: Update version - runs-on: self-hosted - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: Commit snapshot version to current branch - if: ${{ inputs.release }} - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.version }}-SNAPSHOT > version.txt - git add version.txt - git status - git commit -m "${{ inputs.version }}-SNAPSHOT version update." - git push diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml deleted file mode 100644 index 99b10d09f..000000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Pre-release tasks - -on: - workflow_call: - inputs: - release: - required: true - type: boolean - version: - required: true - type: string - outputs: - sha: - description: Current SHA after version update - value: ${{ jobs.pre-publish.outputs.sha }} - -permissions: - contents: write - -jobs: - pre-publish: - name: Update version, tag repo, and return sha - runs-on: self-hosted - outputs: - sha: ${{ steps.return-sha.outputs.sha }} - steps: - - id: checkout - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - id: validate - name: Validate no new commits - run: | - current_sha=$(git rev-parse HEAD) - if test $current_sha != '${{ github.sha }}' - then exit 1 - fi - - id: tag-version - if: ${{ inputs.release }} - name: Update version, tag repo, and return current SHA - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.version }} > version.txt - git add version.txt - git commit -m "${{ inputs.version }} version update." - git push - git tag ${{ inputs.version }} - git push origin refs/tags/${{ inputs.version }} - - id: return-sha - name: Return current SHA - run: | - git rev-parse HEAD - echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76b433503..e9b615134 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,11 +36,42 @@ jobs: pre-release: name: Update version, tag repo, and return sha + permissions: + contents: write needs: [ ci, ci-low-cadence, codeql ] - uses: ./.github/workflows/pre-release.yml - with: - release: ${{ inputs.release }} - version: ${{ inputs.release-version }} + runs-on: self-hosted + outputs: + sha: ${{ steps.return-sha.outputs.sha }} + steps: + - id: checkout + name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.ref }} + - id: validate + name: Validate no new commits + run: | + current_sha=$(git rev-parse HEAD) + if test $current_sha != '${{ github.sha }}' + then exit 1 + fi + - id: tag-version + if: ${{ inputs.release }} + name: Update version, tag repo, and return current SHA + run: | + git config user.name "github-actions" + git config user.email "github-actions@aeron.io" + echo ${{ inputs.release-version }} > version.txt + git add version.txt + git commit -m "${{ inputs.release-version }} version update." + git push + git tag ${{ inputs.release-version }} + git push origin refs/tags/${{ inputs.release-version }} + - id: return-sha + name: Return current SHA + run: | + git rev-parse HEAD + echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" release: name: Release java artifacts @@ -69,8 +100,22 @@ jobs: post-release: name: Update version + permissions: + contents: write needs: release - uses: ./.github/workflows/post-release.yml - with: - release: ${{ inputs.release }} - version: ${{ inputs.next-version }} \ No newline at end of file + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.ref }} + - name: Commit snapshot version to current branch + if: ${{ inputs.release }} + run: | + git config user.name "github-actions" + git config user.email "github-actions@aeron.io" + echo ${{ inputs.next-version }}-SNAPSHOT > version.txt + git add version.txt + git status + git commit -m "${{ inputs.next-version }}-SNAPSHOT version update." + git push \ No newline at end of file From 974cf121987368816fd80aeb8200060f8ad245c9 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 4 Jul 2024 16:47:24 -0400 Subject: [PATCH 63/94] only use sha? --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9b615134..934225a42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,6 +90,11 @@ jobs: with: distribution: 'zulu' java-version: 8 + - name: Setup BUILD_JAVA_HOME & BUILD_JAVA_VERSION + run: | + java -Xinternalversion + echo "BUILD_JAVA_HOME=${JAVA_HOME}" >> $GITHUB_ENV + echo "BUILD_JAVA_VERSION=8" >> $GITHUB_ENV - name: Publish a release run: ./gradlew publish env: From 16a8074e4dbd51c8e0dbd3d0991cad0947f3ac49 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 4 Jul 2024 16:49:20 -0400 Subject: [PATCH 64/94] only use sha? --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 934225a42..b7587e0d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,20 +25,20 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - - codeql: - uses: ./.github/workflows/codeql.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml +# +# codeql: +# uses: ./.github/workflows/codeql.yml pre-release: name: Update version, tag repo, and return sha permissions: contents: write - needs: [ ci, ci-low-cadence, codeql ] +# needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted outputs: sha: ${{ steps.return-sha.outputs.sha }} From 6976ddd34496dd4d4b971c859a51e824285e683b Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Jul 2024 16:50:08 -0400 Subject: [PATCH 65/94] 2.2.5 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index bfb11cb69..21bb5e156 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.5-SNAPSHOT +2.2.5 From ba385774af0a78bf51f294eb0b1f5bae4b447e30 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 4 Jul 2024 16:52:05 -0400 Subject: [PATCH 66/94] 2.3.0-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 21bb5e156..a9d981d17 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.2.5 +2.3.0-SNAPSHOT From 8e1a8c35f790580306b9c07dcdfab64fd88a3bc8 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 11 Jul 2024 10:51:52 -0400 Subject: [PATCH 67/94] test new workflow --- .github/workflows/release.yml | 47 +++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7587e0d5..4df11bab2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,24 +35,23 @@ jobs: # uses: ./.github/workflows/codeql.yml pre-release: - name: Update version, tag repo, and return sha + name: Update version and tag repo for release permissions: contents: write # needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted - outputs: - sha: ${{ steps.return-sha.outputs.sha }} steps: - id: checkout + if: ${{ inputs.release }} name: Checkout uses: actions/checkout@v4 with: ref: ${{ github.ref }} - id: validate + if: ${{ inputs.release }} name: Validate no new commits run: | - current_sha=$(git rev-parse HEAD) - if test $current_sha != '${{ github.sha }}' + if test $(git rev-parse HEAD) != '${{ github.sha }}' then exit 1 fi - id: tag-version @@ -64,14 +63,9 @@ jobs: echo ${{ inputs.release-version }} > version.txt git add version.txt git commit -m "${{ inputs.release-version }} version update." - git push - git tag ${{ inputs.release-version }} - git push origin refs/tags/${{ inputs.release-version }} - - id: return-sha - name: Return current SHA - run: | - git rev-parse HEAD - echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" + #git push -f + git tag -f ${{ inputs.release-version }} + git push -f origin refs/tags/${{ inputs.release-version }} release: name: Release java artifacts @@ -84,7 +78,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ needs.pre-release.outputs.sha }} + ref: ${{ inputs.release && inputs.release-version || github.sha }} - name: Setup java uses: actions/setup-java@v4 with: @@ -103,8 +97,30 @@ jobs: OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} + github-release: + if: ${{ inputs.release }} + name: Create Github Release after release + permissions: + contents: write + needs: release + runs-on: self-hosted + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ inputs.release-version }} + - name: Create Release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ inputs.release-version }} + release_name: Release ${{ inputs.release-version }} + draft: true + post-release: - name: Update version + if: ${{ inputs.release }} + name: Update version after release permissions: contents: write needs: release @@ -115,7 +131,6 @@ jobs: with: ref: ${{ github.ref }} - name: Commit snapshot version to current branch - if: ${{ inputs.release }} run: | git config user.name "github-actions" git config user.email "github-actions@aeron.io" From 4681d7b502fd6bd42c0765f197e7353c6a251bc8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Jul 2024 11:12:20 -0400 Subject: [PATCH 68/94] 2.3.1-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index a9d981d17..ef692ece2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.0-SNAPSHOT +2.3.1-SNAPSHOT From 1fad2d6b36578d9128886674e8ef6f480befb829 Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 11 Jul 2024 11:23:48 -0400 Subject: [PATCH 69/94] test new workflow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4df11bab2..0e5605762 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: echo ${{ inputs.release-version }} > version.txt git add version.txt git commit -m "${{ inputs.release-version }} version update." - #git push -f + git push -f git tag -f ${{ inputs.release-version }} git push -f origin refs/tags/${{ inputs.release-version }} From 06b838fd43d8f61b594aa75d45854baeaa3e7bb6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Jul 2024 11:24:53 -0400 Subject: [PATCH 70/94] 2.3.1 version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index ef692ece2..2bf1c1ccf 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.1-SNAPSHOT +2.3.1 From 939ac1c45f251a05e2631340fe3d0fb4cc626f4d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 11 Jul 2024 11:25:56 -0400 Subject: [PATCH 71/94] 2.3.2-SNAPSHOT version update. --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 2bf1c1ccf..a0e89be42 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.1 +2.3.2-SNAPSHOT From 19a7498bc338ec888516e4a5827d68b4d0c22b8c Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 11 Jul 2024 12:32:24 -0400 Subject: [PATCH 72/94] test on tag push --- .github/workflows/release.yml | 91 +++++------------------------------ 1 file changed, 12 insertions(+), 79 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e5605762..205afe7ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,21 +1,9 @@ name: Release on: - workflow_dispatch: - inputs: - release: - description: Is release? (Will create tag and update version) - required: true - default: false - type: boolean - release-version: - description: Released version (x.y.z) - required: true - type: string - next-version: - description: Next version (x.y.z) - required: true - type: string + push: + tags: + - '*' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -25,54 +13,21 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: -# ci: -# uses: ./.github/workflows/ci.yml -# -# ci-low-cadence: -# uses: ./.github/workflows/ci-low-cadence.yml -# -# codeql: -# uses: ./.github/workflows/codeql.yml + ci: + uses: ./.github/workflows/ci.yml - pre-release: - name: Update version and tag repo for release - permissions: - contents: write -# needs: [ ci, ci-low-cadence, codeql ] - runs-on: self-hosted - steps: - - id: checkout - if: ${{ inputs.release }} - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - id: validate - if: ${{ inputs.release }} - name: Validate no new commits - run: | - if test $(git rev-parse HEAD) != '${{ github.sha }}' - then exit 1 - fi - - id: tag-version - if: ${{ inputs.release }} - name: Update version, tag repo, and return current SHA - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.release-version }} > version.txt - git add version.txt - git commit -m "${{ inputs.release-version }} version update." - git push -f - git tag -f ${{ inputs.release-version }} - git push -f origin refs/tags/${{ inputs.release-version }} + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + + codeql: + uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: read packages: write - needs: pre-release + needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code @@ -116,26 +71,4 @@ jobs: with: tag_name: ${{ inputs.release-version }} release_name: Release ${{ inputs.release-version }} - draft: true - - post-release: - if: ${{ inputs.release }} - name: Update version after release - permissions: - contents: write - needs: release - runs-on: self-hosted - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: Commit snapshot version to current branch - run: | - git config user.name "github-actions" - git config user.email "github-actions@aeron.io" - echo ${{ inputs.next-version }}-SNAPSHOT > version.txt - git add version.txt - git status - git commit -m "${{ inputs.next-version }}-SNAPSHOT version update." - git push \ No newline at end of file + draft: true \ No newline at end of file From 945d98e595ac820f28d5ad43bd4a09f13ff64faa Mon Sep 17 00:00:00 2001 From: marcpinto-adaptive Date: Thu, 11 Jul 2024 12:32:55 -0400 Subject: [PATCH 73/94] 2.3.2 release --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index a0e89be42..f90b1afc0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.2-SNAPSHOT +2.3.2 From d31e54cdc5123f9c8b8143611ea3e450f796a0ea Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:45:49 -0400 Subject: [PATCH 74/94] test on tag push --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index f90b1afc0..0bee604df 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.2 +2.3.3 From f44d31539f5f3114144d45443e3353a88bbc9f37 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:46:40 -0400 Subject: [PATCH 75/94] 2.3.4 --- .github/workflows/release.yml | 18 +++++++++--------- version.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 205afe7ed..e5117d101 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,21 +13,21 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - - codeql: - uses: ./.github/workflows/codeql.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml +# +# codeql: +# uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: read packages: write - needs: [ ci, ci-low-cadence, codeql ] +# needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code diff --git a/version.txt b/version.txt index 0bee604df..3f684d2d9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.3 +2.3.4 From 574a2696391f3a6080532999a9ab39f5b7080b7f Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:47:12 -0400 Subject: [PATCH 76/94] 2.3.5 SNAPSHOT --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 3f684d2d9..ef4e9da6a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.4 +2.3.5-SNAPSHOT From 828e8d7246baf5b0eff8c36b772c5b1b829b600d Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:51:50 -0400 Subject: [PATCH 77/94] 2.3.5 tag --- .github/workflows/release.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5117d101..49f9f14c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ name: Release on: + workflow_dispatch: push: tags: - '*' @@ -13,27 +14,27 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: -# ci: -# uses: ./.github/workflows/ci.yml -# -# ci-low-cadence: -# uses: ./.github/workflows/ci-low-cadence.yml -# -# codeql: -# uses: ./.github/workflows/codeql.yml + ci: + uses: ./.github/workflows/ci.yml + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + + codeql: + uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: read packages: write -# needs: [ ci, ci-low-cadence, codeql ] + needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ inputs.release && inputs.release-version || github.sha }} + ref: ${{ github.event_name == 'push' && github.ref || github.sha }} - name: Setup java uses: actions/setup-java@v4 with: @@ -53,7 +54,7 @@ jobs: OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} github-release: - if: ${{ inputs.release }} + if: ${{ github.event_name == 'push' }} name: Create Github Release after release permissions: contents: write @@ -63,12 +64,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: ${{ inputs.release-version }} + ref: ${{ github.ref }} - name: Create Release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ inputs.release-version }} - release_name: Release ${{ inputs.release-version }} + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} draft: true \ No newline at end of file From 7ed73af6e1de7b1b751ab313a417b9e9b68efa10 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:51:54 -0400 Subject: [PATCH 78/94] 2.3.5 tag --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index ef4e9da6a..3b2652486 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.5-SNAPSHOT +2.3.5 \ No newline at end of file From 1085abba2cf2cc0253b7857cea1d509d686d5fcb Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:52:34 -0400 Subject: [PATCH 79/94] 2.3.5 tag --- .github/workflows/release.yml | 18 +++++++++--------- version.txt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49f9f14c0..057ccba97 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,21 +14,21 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: - ci: - uses: ./.github/workflows/ci.yml - - ci-low-cadence: - uses: ./.github/workflows/ci-low-cadence.yml - - codeql: - uses: ./.github/workflows/codeql.yml +# ci: +# uses: ./.github/workflows/ci.yml +# +# ci-low-cadence: +# uses: ./.github/workflows/ci-low-cadence.yml +# +# codeql: +# uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: read packages: write - needs: [ ci, ci-low-cadence, codeql ] +# needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code diff --git a/version.txt b/version.txt index 3b2652486..0501b79e9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.5 \ No newline at end of file +2.3.6 \ No newline at end of file From a39b1883bca858a262cd0859112ceb53c95261fe Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:54:28 -0400 Subject: [PATCH 80/94] 2.3.7 tag --- .github/workflows/release.yml | 16 ++-------------- version.txt | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 057ccba97..a3d6684fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,20 +52,8 @@ jobs: SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - - github-release: - if: ${{ github.event_name == 'push' }} - name: Create Github Release after release - permissions: - contents: write - needs: release - runs-on: self-hosted - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - name: Create Release + - name: Create Release Notes + if: ${{ github.event_name == 'push' }} uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/version.txt b/version.txt index 0501b79e9..51bd85577 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.6 \ No newline at end of file +2.3.7 \ No newline at end of file From 3c9fdf68371e537a538875b99f703e76d4fa0aae Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 11 Jul 2024 12:56:37 -0400 Subject: [PATCH 81/94] 2.3.8 tag --- .github/workflows/release.yml | 5 ++--- version.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3d6684fc..55f226889 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: release: name: Release java artifacts permissions: - contents: read + contents: write packages: write # needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted @@ -52,8 +52,7 @@ jobs: SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - - name: Create Release Notes - if: ${{ github.event_name == 'push' }} + - name: Create Release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/version.txt b/version.txt index 51bd85577..3f5e730fc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.7 \ No newline at end of file +2.3.8 \ No newline at end of file From 6f3d9d4ba3626ff239defd896519bf152d8df86c Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Sat, 13 Jul 2024 15:45:20 -0400 Subject: [PATCH 82/94] 2.3.8 tag --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55f226889..76313e9bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - ref: ${{ github.event_name == 'push' && github.ref || github.sha }} + ref: ${{ github.ref }} - name: Setup java uses: actions/setup-java@v4 with: From 997cc382f83a26857e242742342540f83ab07b9d Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Sun, 14 Jul 2024 19:50:00 -0400 Subject: [PATCH 83/94] final --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76313e9bd..95b384721 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,6 +35,14 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.ref }} + - name: Create Release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: true - name: Setup java uses: actions/setup-java@v4 with: @@ -52,11 +60,3 @@ jobs: SIGNING_GPG_PASSWORD: ${{ secrets.signingPassword }} OSSRH_USERNAME: ${{ secrets.ossrhUsername }} OSSRH_PASSWORD: ${{ secrets.ossrhPassword }} - - name: Create Release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: true \ No newline at end of file From bb3bdfe51cbc2f1769bf653dbaf0ff45cdec2b16 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Sun, 14 Jul 2024 19:50:46 -0400 Subject: [PATCH 84/94] 3.0.0 released --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 3f5e730fc..4a36342fc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.3.8 \ No newline at end of file +3.0.0 From 8b04ad546d4f3433e38cfc6540bd6bb155a3d361 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Sun, 14 Jul 2024 19:51:21 -0400 Subject: [PATCH 85/94] 3.1.0 snapshot --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 4a36342fc..8dbae45fe 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.0.0 +3.1.0-SNAPSHOT From 2786542ddb745073c2c33271899e29bfbdee80a1 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Mon, 15 Jul 2024 12:47:05 -0400 Subject: [PATCH 86/94] final --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 95b384721..a7c83e93a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: tags: - - '*' + - '*.*.*' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -41,7 +41,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + release_name: ${{ github.ref }} draft: true - name: Setup java uses: actions/setup-java@v4 From e48eba8c17c88ab9bf9eebfeb4283c60f1d79394 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Mon, 15 Jul 2024 12:54:24 -0400 Subject: [PATCH 87/94] 1000.0.0 release --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 8dbae45fe..06fd8bdf8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -3.1.0-SNAPSHOT +1000.0.0 From 193797d8e9a3903148bdce0edfc01e1ffa02bddf Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Mon, 15 Jul 2024 12:54:41 -0400 Subject: [PATCH 88/94] 1000.1.0 snapshot --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 06fd8bdf8..851a1f994 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1000.0.0 +1000.1.0-SNAPSHOT From ac2e7457b04567edd4aa3869077ad4133861d71f Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Wed, 17 Jul 2024 08:44:29 -0400 Subject: [PATCH 89/94] final --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7c83e93a..d27c98d87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,21 +14,21 @@ env: GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.java.installations.auto-detect=false -Dorg.gradle.warning.mode=fail' jobs: -# ci: -# uses: ./.github/workflows/ci.yml -# -# ci-low-cadence: -# uses: ./.github/workflows/ci-low-cadence.yml -# -# codeql: -# uses: ./.github/workflows/codeql.yml + ci: + uses: ./.github/workflows/ci.yml + + ci-low-cadence: + uses: ./.github/workflows/ci-low-cadence.yml + + codeql: + uses: ./.github/workflows/codeql.yml release: name: Release java artifacts permissions: contents: write packages: write -# needs: [ ci, ci-low-cadence, codeql ] + needs: [ ci, ci-low-cadence, codeql ] runs-on: self-hosted steps: - name: Checkout code From a578d9108a6d87eec4326979f9125ea7b5a7e6fe Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Wed, 17 Jul 2024 08:45:21 -0400 Subject: [PATCH 90/94] 1000.1.0 release --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 851a1f994..9233fa9c2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1000.1.0-SNAPSHOT +1000.1.0 From 2ba4809bb34a4f1ba1b2f820becb296279c897b1 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Wed, 17 Jul 2024 08:45:21 -0400 Subject: [PATCH 91/94] 1000.2.0 snapshot --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 9233fa9c2..015c21d61 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1000.1.0 +1000.2.0-SNAPSHOT From 5e9d876a9b93921bed2b659c16d383a711f1f415 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 25 Jul 2024 09:15:30 -0400 Subject: [PATCH 92/94] dependency submission --- .github/workflows/dependency-submission.yml | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/dependency-submission.yml 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 From 6645d341ade032786fbd6d251d56ec417e3387a9 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 25 Jul 2024 09:18:16 -0400 Subject: [PATCH 93/94] dependency submission --- .github/workflows/dependency-submission.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml index dafdc0278..7aa5a8829 100644 --- a/.github/workflows/dependency-submission.yml +++ b/.github/workflows/dependency-submission.yml @@ -27,4 +27,4 @@ jobs: 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 + build-scan-terms-of-use-agree: "yes" From db776292ee764c279c7df65f614ae0d0b0c6a7b9 Mon Sep 17 00:00:00 2001 From: marc-adaptive Date: Thu, 25 Jul 2024 11:06:22 -0400 Subject: [PATCH 94/94] dependency submission --- .github/workflows/dependency-submission.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml index 7aa5a8829..dafdc0278 100644 --- a/.github/workflows/dependency-submission.yml +++ b/.github/workflows/dependency-submission.yml @@ -27,4 +27,4 @@ jobs: 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" + build-scan-terms-of-use-agree: "yes" \ No newline at end of file