From 05166820c575c2bf0b3344d3f7a2964584821d51 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 22:44:08 +0000 Subject: [PATCH 1/3] chore(deps): update support-deps to v1.5.1 | datasource | package | from | to | | ----------- | -------------------------- | ------ | ------ | | github-tags | defenseunicorns/uds-common | v1.4.0 | v1.5.1 | --- .github/workflows/ci-docs-shim.yaml | 2 +- .github/workflows/commitlint.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/scorecard.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- tasks.yaml | 20 ++++++++++---------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-docs-shim.yaml b/.github/workflows/ci-docs-shim.yaml index 6918b8f..0c93962 100644 --- a/.github/workflows/ci-docs-shim.yaml +++ b/.github/workflows/ci-docs-shim.yaml @@ -18,7 +18,7 @@ jobs: matrix: type: [install, upgrade] flavor: [upstream, unicorn] - uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 with: flavor: ${{ matrix.flavor }} type: ${{ matrix.type }} diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index a2d9bb5..3f0ee1f 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -15,4 +15,4 @@ permissions: jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 60d02cd..0f4b18d 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,5 +15,5 @@ permissions: jobs: validate: - uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 90d8f84..87c76a8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -41,7 +41,7 @@ jobs: exclude: - flavor: registry1 architecture: arm64 - uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 with: flavor: ${{ matrix.flavor }} runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-8-core' || 'uds-swf-ubuntu-big-boy-8-core' }} diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index 442fbe4..f5f38dc 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -32,5 +32,5 @@ jobs: security-events: write # Used to receive a badge. id-token: write - uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-scorecard.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 secrets: inherit diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0ed3a0a..2ab72b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: test-flavor - uses: defenseunicorns/uds-common/.github/actions/test-flavor@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/actions/test-flavor@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 id: test-flavor outputs: upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }} @@ -56,7 +56,7 @@ jobs: matrix: type: [install, upgrade] flavor: [upstream, unicorn] - uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@5b91b1e0809cc34b397cf3914cda81e32ccb85b2 # v1.4.0 + uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@a94be6798ba20e2d23fe16afc6578e442e55fb0a # v1.5.1 with: upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }} flavor: ${{ matrix.flavor }} diff --git a/tasks.yaml b/tasks.yaml index ae91e35..7ce318f 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -3,16 +3,16 @@ includes: - test: ./tasks/test.yaml - - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/create.yaml - - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/publish.yaml - - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/lint.yaml - - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/pull.yaml - - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/deploy.yaml - - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/setup.yaml - - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/actions.yaml - - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/badge.yaml - - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/upgrade.yaml - - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.4.0/tasks/compliance.yaml + - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/create.yaml + - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/publish.yaml + - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/lint.yaml + - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/pull.yaml + - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/deploy.yaml + - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/setup.yaml + - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/actions.yaml + - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/badge.yaml + - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/upgrade.yaml + - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/compliance.yaml tasks: - name: default From 8c588231d9d0c18140d4bfba623823679ea21d51 Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Tue, 10 Dec 2024 15:49:12 -0700 Subject: [PATCH 2/3] update to uds-releaser --- .github/workflows/lint.yaml | 2 +- .github/workflows/release.yaml | 17 ++--------------- .github/workflows/test.yaml | 5 ++--- .release-please-manifest.json | 3 --- bundle/uds-bundle.yaml | 8 ++------ release-please-config.json | 24 ------------------------ releaser.yaml | 10 ++++++++++ tasks.yaml | 4 ---- version.txt | 1 - zarf.yaml | 4 +--- 10 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 .release-please-manifest.json delete mode 100644 release-please-config.json create mode 100644 releaser.yaml delete mode 100644 version.txt diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0f4b18d..7b435a2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -6,7 +6,7 @@ name: Lint on: # This workflow is triggered on pull requests to the main branch. pull_request: - # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). + # milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly types: [milestoned, opened, reopened, synchronize] # Permissions for the GITHUB_TOKEN used by the workflow. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 87c76a8..67989a4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,25 +15,11 @@ permissions: id-token: write jobs: - tag-new-version: - permissions: write-all - runs-on: ubuntu-latest - 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: read # Allows reading the content of the repository. + contents: write # Allows reading the content of the repository. packages: write # Allows reading the content of the repository's packages. id-token: write - needs: tag-new-version - if: ${{ needs.tag-new-version.outputs.release_created == 'true' }} strategy: matrix: flavor: [upstream, unicorn] @@ -45,4 +31,5 @@ jobs: with: flavor: ${{ matrix.flavor }} runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-8-core' || 'uds-swf-ubuntu-big-boy-8-core' }} + uds-releaser: true secrets: inherit # Inherits all secrets from the parent workflow. diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2ab72b1..60943b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,7 +6,7 @@ name: Test on: # This workflow is triggered on pull requests to the main branch. pull_request: - # milestoned is added here as a workaround for release-please not triggering PR workflows (PRs should be added to a milestone to trigger the workflow). + # milestoned is added here as a way to retrigger workflows that are stuck or otherwise didn't run correctly types: [milestoned, opened, reopened, synchronize] paths-ignore: - "**.md" @@ -18,8 +18,7 @@ on: - docs/** - .gitignore - renovate.json - - .release-please-config.json - - release-please-config.json + - releaser.yaml - CODEOWNERS - LICENSE - CONTRIBUTING.md diff --git a/.release-please-manifest.json b/.release-please-manifest.json deleted file mode 100644 index 92d7d01..0000000 --- a/.release-please-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - ".": "8.0.1-uds.2" -} diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index 5fbe0c3..f0b4976 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -5,16 +5,12 @@ kind: UDSBundle metadata: name: valkey-test description: A UDS bundle for deploying Valkey and on a development cluster - # x-release-please-start-version - version: 8.0.1-uds.2 - # x-release-please-end + version: dev packages: - name: valkey path: ../ - # x-release-please-start-version - ref: 8.0.1-uds.2 - # x-release-please-end + ref: dev overrides: valkey: uds-valkey-config: diff --git a/release-please-config.json b/release-please-config.json deleted file mode 100644 index b883dd5..0000000 --- a/release-please-config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "packages": { - ".": { - "changelog-path": "CHANGELOG.md", - "changelog-sections": [ - { "type": "feat", "section": "Features", "hidden": false }, - { "type": "fix", "section": "Bug Fixes", "hidden": false }, - { "type": "chore", "section": "Miscellaneous", "hidden": false } - ], - "release-type": "simple", - "bump-minor-pre-major": true, - "bump-patch-for-minor-pre-major": true, - "draft": false, - "versioning": "prerelease", - "prerelease-type": "uds", - "extra-files": [ - "bundle/uds-bundle.yaml", - "tasks.yaml", - "zarf.yaml" - ] - } - }, - "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" -} diff --git a/releaser.yaml b/releaser.yaml new file mode 100644 index 0000000..b2255a9 --- /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=bitnami/valkey extractVersion=^(?\d+\.\d+\.\d+)(-debian-.*)?$ + version: 8.0.1-uds.3 + - name: unicorn + # renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/valkey + version: 8.0.1-uds.3 diff --git a/tasks.yaml b/tasks.yaml index 7ce318f..669c909 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -74,7 +74,3 @@ tasks: - task: create-deploy-test-bundle - description: Publish the package task: publish:package - with: - # x-release-please-start-version - version: "8.0.1-uds.2" - # x-release-please-end diff --git a/version.txt b/version.txt deleted file mode 100644 index be70457..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -8.0.1-uds.2 diff --git a/zarf.yaml b/zarf.yaml index 718d4f8..14fb617 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -6,9 +6,7 @@ metadata: name: valkey description: "A deployment of Valkey (a Redis alternative by the Linux Foundation)" url: https://github.com/valkey-io/valkey - # x-release-please-start-version - version: "8.0.1-uds.2" - # x-release-please-end + version: "dev" components: - name: valkey From 582a42306fa7a51c9613451a6c888523d187efee Mon Sep 17 00:00:00 2001 From: Wayne Starr Date: Tue, 10 Dec 2024 15:54:11 -0700 Subject: [PATCH 3/3] add the second one --- bundle/uds-bundle.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml index f0b4976..11dd717 100644 --- a/bundle/uds-bundle.yaml +++ b/bundle/uds-bundle.yaml @@ -46,9 +46,7 @@ packages: memory: 300Mi - name: valkey path: ../ - # x-release-please-start-version - ref: 8.0.1-uds.2 - # x-release-please-end + ref: dev overrides: valkey: uds-valkey-config: