diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5973204..2b6ce4c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,18 +15,6 @@ permissions: id-token: write jobs: - tag-new-version: - permissions: write-all - runs-on: uds-marketplace-ubuntu-big-boy-4-core - outputs: - release_created: ${{ steps.release-flag.outputs.release_created }} - steps: - - name: Create Release Tag - id: tag - uses: googleapis/release-please-action@7987652d64b4581673a76e33ad5e98e3dd56832f # v4.1.3 - - id: release-flag - run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> "$GITHUB_OUTPUT" - publish: permissions: contents: write # Allows reading the content of the repository. @@ -42,4 +30,5 @@ jobs: with: flavor: ${{ matrix.flavor }} runsOn: uds-marketplace-ubuntu-big-boy-8-core + uds-releaser: true secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index d6173b0..b3eda80 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -5,9 +5,7 @@ kind: UDSBundle metadata: name: jira-test description: A UDS bundle for deploying jira and it's dependencies on a development cluster - # x-release-please-start-version - version: 10.3.0-uds.0 - # x-release-please-end + version: dev packages: - name: dev-namespace @@ -31,9 +29,7 @@ packages: - name: jira path: ../ - # x-release-please-start-version - ref: 10.3.0-uds.0 - # x-release-please-end + ref: dev overrides: jira: uds-jira-config: diff --git a/releaser.yaml b/releaser.yaml new file mode 100644 index 0000000..3a5a9e7 --- /dev/null +++ b/releaser.yaml @@ -0,0 +1,10 @@ +# Copyright 2024 Defense Unicorns +# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial + +flavors: + - name: upstream + # renovate-uds: datasource=docker depName=atlassian/jira-software + version: 10.3.1-uds.0 + - name: registry1 + # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/atlassian/jira-data-center/jira-node + version: 10.3.1-uds.0 diff --git a/tasks.yaml b/tasks.yaml index 1404371..2ba2fae 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -87,7 +87,3 @@ tasks: - description: Publish the packages task: publish:package - with: - # x-release-please-start-version - version: 10.3.0-uds.0 - # x-release-please-end diff --git a/zarf.yaml b/zarf.yaml index 75c4c7c..84bdb55 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -6,9 +6,7 @@ kind: ZarfPackageConfig metadata: name: jira description: "UDS Jira package" - # x-release-please-start-version - version: "10.3.0-uds.0" - # x-release-please-end + version: dev variables: - name: JIRA_DB_NAME default: "jiradb"