diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c580d7..ef647fb3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - name: Publish run: mvn -T 1.5C -B deploy -DaltDeploymentRepository=set-github::https://maven.pkg.github.com/${{ github.repository }} working-directory: java - if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/tags/') + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml index 0345a385..3d898f21 100644 --- a/.github/workflows/create-release-branch.yml +++ b/.github/workflows/create-release-branch.yml @@ -7,6 +7,9 @@ on: version: description: 'Release version. Format: .' required: true + next-version: + description: 'Next release version. Format .. Default is next minor version' + required: false citag: description: 'Optional tag to identify runs via the API. Displayed in run name.' required: false @@ -15,9 +18,11 @@ on: jobs: release-branch: uses: eclipse-set/build/.github/workflows/release-branch.yml@main + secrets: inherit permissions: contents: write with: version: ${{ inputs.version }} target: "java/org.eclipse.set.model.releng.target/org.eclipse.set.model.releng.target.target" pom: 'java/pom.xml' + development-version: ${{ inputs.next-version }} diff --git a/.github/workflows/create-release-tag.yml b/.github/workflows/create-release-tag.yml index 33dfb925..82595cc5 100644 --- a/.github/workflows/create-release-tag.yml +++ b/.github/workflows/create-release-tag.yml @@ -15,6 +15,7 @@ on: jobs: release-tag: uses: eclipse-set/build/.github/workflows/release-tag.yml@main + secrets: inherit permissions: contents: write with: