chore(deps): update support-deps to v1.5.1 (#146)

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [defenseunicorns/uds-common](https://redirect.github.com/defenseunicorns/uds-common) | | minor | `v1.4.0` -> `v1.5.1` | | [defenseunicorns/uds-common](https://redirect.github.com/defenseunicorns/uds-common) | action | minor | `v1.4.0` -> `v1.5.1` | --- ### Release Notes <details> <summary>defenseunicorns/uds-common (defenseunicorns/uds-common)</summary> ### [`v1.5.1`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.5.1) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.5.0...v1.5.1) ##### Miscellaneous - add a renovate rule for handling uds versions from upstream ones ([#359](https://redirect.github.com/defenseunicorns/uds-common/issues/359)) ([34dfed1](https://redirect.github.com/defenseunicorns/uds-common/commit/34dfed162e220d6cdbb13b8910a78ff3d00d1f08)) ### [`v1.5.0`](https://redirect.github.com/defenseunicorns/uds-common/releases/tag/v1.5.0) [Compare Source](https://redirect.github.com/defenseunicorns/uds-common/compare/v1.4.0...v1.5.0) ##### ⚠ BREAKING CHANGES - fix the release process permissions (contents: write) ([#355](https://redirect.github.com/defenseunicorns/uds-common/issues/355)) - **deps:** update uds common support dependencies (ubuntu-latest can no longer be used) ([#354](https://redirect.github.com/defenseunicorns/uds-common/issues/354)) ##### Features - provide uds-releaser option for publishing uds packages ([#341](https://redirect.github.com/defenseunicorns/uds-common/issues/341)) ([62f8c28](https://redirect.github.com/defenseunicorns/uds-common/commit/62f8c28b2db62a0fbcbad5a7a639c65de2359696)) ##### Bug Fixes - check tests directories in renovate updates ([#351](https://redirect.github.com/defenseunicorns/uds-common/issues/351)) ([61385c2](https://redirect.github.com/defenseunicorns/uds-common/commit/61385c2fc0463e125e1914d59c4d7288976c5628)) - quote conditional and add use chkpt false ([#357](https://redirect.github.com/defenseunicorns/uds-common/issues/357)) ([4cda4d9](https://redirect.github.com/defenseunicorns/uds-common/commit/4cda4d94ca965781e57e36000a8b7159197533be)) ##### Miscellaneous - fix the release process permissions ([#355](https://redirect.github.com/defenseunicorns/uds-common/issues/355)) ([517932c](https://redirect.github.com/defenseunicorns/uds-common/commit/517932c890e0be62a87ef3f44ce88f9f3f587d5b)) - **deps:** update uds common package dependencies to v1.27.3 ([#349](https://redirect.github.com/defenseunicorns/uds-common/issues/349)) ([4fbe49f](https://redirect.github.com/defenseunicorns/uds-common/commit/4fbe49f520cfa2c8ca38a39b829a7b2c782bae47)) - **deps:** update uds common support dependencies ([#348](https://redirect.github.com/defenseunicorns/uds-common/issues/348)) ([4430e46](https://redirect.github.com/defenseunicorns/uds-common/commit/4430e46bcd30092cb25e24bc278b54602602c3fb)) - **deps:** update uds common support dependencies ([#354](https://redirect.github.com/defenseunicorns/uds-common/issues/354)) ([511d894](https://redirect.github.com/defenseunicorns/uds-common/commit/511d8940991eaba185dd52d11a3d37efa7defcd8)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/uds-package-sonarqube).  --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <[email protected]> Co-authored-by: Wayne Starr <[email protected]>
defenseunicorns · Dec 10, 2024 · ec0e352 · ec0e352
1 parent ddff85a
commit ec0e352
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 74 deletions.
diff --git 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, registry1, 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
@@ -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
@@ -11,10 +11,10 @@ on:
   # This workflow is triggered on pull requests to the main branch.
   pull_request:
     branches: [main]
-    # 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]
 
 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
@@ -15,21 +15,9 @@ 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
@@ -41,9 +29,10 @@ 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' }}
       reports-path: "tests/.playwright/reports/"
+      uds-releaser: true
     secrets: inherit # Inherits all secrets from the parent workflow.
diff --git 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
@@ -7,7 +7,7 @@ on:
   # This workflow is triggered on pull requests to the main branch.
   pull_request:
     branches: [main]
-    # 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"
@@ -19,8 +19,7 @@ on:
       - docs/**
       - .gitignore
       - renovate.json
-      - .release-please-config.json
-      - release-please-config.json
+      - releaser.yaml
       - CODEOWNERS
       - LICENSE
       - CONTRIBUTING.md
@@ -45,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 }}
@@ -57,7 +56,7 @@ jobs:
       matrix:
         type: [install, upgrade]
         flavor: [upstream, unicorn, registry1]
-    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/.release-please-manifest.json b/.release-please-manifest.json
diff --git a/bundle/uds-bundle.yaml b/bundle/uds-bundle.yaml
@@ -5,9 +5,7 @@ kind: UDSBundle
 metadata:
   name: sonarqube-test
   description: A UDS bundle for deploying Sonarqube and it's dependencies on a development cluster
-  # x-release-please-start-version
-  version: 10.7.0-uds.4
-  # x-release-please-end
+  version: dev
 
 packages:
   - name: postgres-operator
@@ -34,9 +32,7 @@ packages:
 
   - name: sonarqube
     path: ../
-    # x-release-please-start-version
-    ref: 10.7.0-uds.4
-    # x-release-please-end
+    ref: dev
     overrides:
       sonarqube:
         sonarqube:

diff --git a/release-please-config.json b/release-please-config.json
diff --git a/releaser.yaml b/releaser.yaml
@@ -0,0 +1,13 @@
+# 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=sonarqube extractVersion=^(?<version>\d+\.\d+\.\d+)(-community)?$
+    version: 10.7.0-uds.5
+  - name: registry1
+    # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/sonarsource/sonarqube/sonarqube extractVersion=^(?<version>\d+\.\d+\.\d+)(-community)?$
+    version: 10.7.0-uds.5
+  - name: unicorn
+    # renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/sonarqube
+    version: 10.7.0-uds.5
diff --git 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
@@ -76,7 +76,3 @@ tasks:
       - task: create-deploy-test-bundle
       - description: Publish the package
         task: publish:package
-        with:
-          # x-release-please-start-version
-          version: "10.7.0-uds.4"
-          # x-release-please-end
diff --git a/zarf.yaml b/zarf.yaml
@@ -6,9 +6,7 @@ kind: ZarfPackageConfig
 metadata:
   name: sonarqube
   description: "UDS Sonarqube package"
-  # x-release-please-start-version
-  version: "10.7.0-uds.4"
-  # x-release-please-end
+  version: "dev"
 
 variables:
   - name: SONARQUBE_DEPENDS_ON