chore(deps): update renovate support dependencies (#30)

* chore(deps): update renovate support dependencies | datasource | package | from | to | | ----------- | --------------------------------------------------- | ------ | ------ | | npm | @babel/preset-typescript | 7.24.1 | 7.26.0 | | github-tags | defenseunicorns/uds-common | v1.3.0 | v1.5.1 | | npm | kubernetes-fluent-client | 3.2.0 | 3.3.7 | | npm | ts-jest | 29.1.2 | 29.2.5 | | maven | org.springframework.boot:spring-boot-starter-parent | 3.3.4 | 3.4.0 | * swap to releaser --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <[email protected]>
defenseunicorns · Dec 13, 2024 · 6a94cea · 6a94cea
1 parent 7a08a8c
commit 6a94cea
Show file tree

Hide file tree

Showing 14 changed files with 305 additions and 410 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@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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
@@ -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.
@@ -15,5 +15,5 @@ permissions:
 
 jobs:
   validate:
-    uses: defenseunicorns/uds-common/.github/workflows/callable-lint.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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,35 +15,22 @@ 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.
-      packages: write # Allows reading the content of the repository's packages.
+      contents: write # Allows writing the content of the repository.
+      packages: write # Allows writing 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, registry1, unicorn]
         architecture: [amd64, arm64]
         exclude:
           - flavor: registry1
             architecture: arm64
-    uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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-4-core' || 'uds-swf-ubuntu-big-boy-8-core' }}
       timeout: 60
+      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@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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
@@ -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
@@ -44,7 +43,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: test-flavor
-        uses: defenseunicorns/uds-common/.github/actions/test-flavor@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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 +55,7 @@ jobs:
       matrix:
         type: [install, upgrade]
         flavor: [upstream, registry1, unicorn]
-    uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@164ce64c5cc775193a563db7e8ef9750ffefcdda # v1.3.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: renovate-test
   description: A UDS bundle for deploying Renovate and it's dependencies on a development cluster
-  # x-release-please-start-version
-  version: 39.0.3-uds.0
-  # x-release-please-end
+  version: dev
 
 packages:
   - name: valkey
@@ -39,9 +37,7 @@ packages:
 
   - name: renovate
     path: ../
-    # x-release-please-start-version
-    ref: 39.0.3-uds.0
-    # x-release-please-end
+    ref: dev
     overrides:
       renovate:
         renovate:

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=ghcr.io/renovatebot/renovate extractVersion=^(?<version>\d+\.\d+\.\d+)(-full)?$
+    version: 39.0.3-uds.1
+  - name: registry1
+    # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/container-hardening-tools/renovate/renovate
+    version: 39.0.3-uds.1
+  - name: unicorn
+    # renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/renovate-fips
+    version: 39.0.3-uds.1
diff --git a/tasks.yaml b/tasks.yaml
@@ -4,16 +4,16 @@
 includes:
   - dependencies: ./tasks/dependencies.yaml
   - test: ./tasks/test.yaml
-  - create: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/create.yaml
-  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/publish.yaml
-  - lint: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/lint.yaml
-  - pull: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/pull.yaml
-  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/deploy.yaml
-  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/setup.yaml
-  - actions: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/actions.yaml
-  - badge: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/badge.yaml
-  - upgrade: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.0/tasks/upgrade.yaml
-  - compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.3.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
@@ -83,7 +83,3 @@ tasks:
         if: ${{ ne .variables.ARCH "arm64" }}
       - description: Publish the package
         task: publish:package
-        with:
-          # x-release-please-start-version
-          version: "39.0.3-uds.0"
-          # x-release-please-end
diff --git a/tests/journey/repo-sources/demo-repo-maven/pom.xml b/tests/journey/repo-sources/demo-repo-maven/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.4</version>
+		<version>3.4.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>