merge conflict resolution

.github/workflows/ci-docs-shim.yaml

@@ -1,3 +1,6 @@
+# Copyright 2024 Defense Unicorns
+# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
+
 name: CI Docs Shim
 
 on:
@@ -11,7 +14,7 @@ jobs:
       matrix:
         type: [install, upgrade]
         flavor: [upstream, registry1, unicorn]
-    uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@86886015d1edc43036b3dd000fbd972a384beb8f # v1.0.0
+    uses: defenseunicorns/uds-common/.github/workflows/callable-ci-docs-shim.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0
     with:
       flavor: ${{ matrix.flavor }}
       type: ${{ matrix.type }}

.github/workflows/commitlint.yaml

@@ -1,3 +1,6 @@
+# Copyright 2024 Defense Unicorns
+# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
+
 name: Metadata
 
 on:
@@ -7,4 +10,4 @@ on:
 
 jobs:
   validate:
-    uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@86886015d1edc43036b3dd000fbd972a384beb8f # v1.0.0
+    uses: defenseunicorns/uds-common/.github/workflows/callable-commitlint.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0

.github/workflows/release.yaml

@@ -1,3 +1,6 @@
+# Copyright 2024 Defense Unicorns
+# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
+
 name: Release
 
 on:
@@ -34,13 +37,9 @@ jobs:
     strategy:
       matrix:
         flavor: [upstream, registry1, unicorn]
-        architecture: [amd64, arm64]
-        exclude:
-          - flavor: registry1
-            architecture: arm64
-    uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@86886015d1edc43036b3dd000fbd972a384beb8f # v1.0.0
+        architecture: [amd64]
+    uses: defenseunicorns/uds-common/.github/workflows/callable-publish.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0
     with:
       flavor: ${{ matrix.flavor }}
-      runsOn: ${{ matrix.architecture == 'arm64' && 'uds-swf-ubuntu-arm64-4-core' || 'uds-swf-ubuntu-big-boy-4-core' }}
-      reports-path: "tests/.playwright/reports/"
+      runsOn: uds-marketplace-ubuntu-big-boy-8-core
     secrets: inherit # Inherits all secrets from the parent workflow.

.github/workflows/test.yaml

@@ -1,3 +1,6 @@
+# Copyright 2024 Defense Unicorns
+# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
+
 name: Test
 
 # This workflow is triggered on pull requests to the main branch.
@@ -35,13 +38,14 @@ permissions:
 
 jobs:
   check-flavor:
-    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    runs-on: uds-marketplace-ubuntu-big-boy-8-core
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: test-flavor
-        uses: defenseunicorns/uds-common/.github/actions/test-flavor@86886015d1edc43036b3dd000fbd972a384beb8f # v1.0.0
+        uses: defenseunicorns/uds-common/.github/actions/test-flavor@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0
         id: test-flavor
     outputs:
       upgrade-flavors: ${{ steps.test-flavor.outputs.upgrade-flavors }}
@@ -52,9 +56,11 @@ jobs:
       fail-fast: false
       matrix:
         type: [install, upgrade]
-        flavor: [upstream, unicorn, registry1]
-    uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@86886015d1edc43036b3dd000fbd972a384beb8f # v1.0.0
+        flavor: [upstream, unicorn]
+    uses: defenseunicorns/uds-common/.github/workflows/callable-test.yaml@2a5e66fceb5c506008d5f69f42abcf38ccf86b44 # v1.2.0
     with:
+      timeout: 30
+      runsOn: uds-marketplace-ubuntu-big-boy-8-core
       upgrade-flavors: ${{ needs.check-flavor.outputs.upgrade-flavors }}
       flavor: ${{ matrix.flavor }}
       type: ${{ matrix.type }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "5.6.1-uds.0"
+    ".": "5.6.1-uds.1"
 }

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.6.1-uds.1](https://github.com/defenseunicorns/uds-package-jenkins/compare/v5.6.1-uds.0...v5.6.1-uds.1) (2024-10-29)
+
+
+### Miscellaneous
+
+* add licensing ([7fd55fd](https://github.com/defenseunicorns/uds-package-jenkins/commit/7fd55fd20ccfb25cfa0ffa63af2523c52239e725))
+* add licensing and lint ([2dfff33](https://github.com/defenseunicorns/uds-package-jenkins/commit/2dfff33ae42a11867ccf9364578f4be4c6537e7f))
+* add linting fixes ([684da33](https://github.com/defenseunicorns/uds-package-jenkins/commit/684da33d081fe161942978cfbff8487ffab43f84))
+* add registry1 ([025d875](https://github.com/defenseunicorns/uds-package-jenkins/commit/025d875dfb5f247aa07e044098d8f45614537d41))
+* change lint.yaml ([7f84661](https://github.com/defenseunicorns/uds-package-jenkins/commit/7f84661dc0c4a09d36563cfdf5f1dc63be6fa6ec))
+* change lint.yaml ([619bf70](https://github.com/defenseunicorns/uds-package-jenkins/commit/619bf70e035b751ced91768b891e498a942caa7b))
+* exclude registry1 ([4b50b48](https://github.com/defenseunicorns/uds-package-jenkins/commit/4b50b489096eb5cea3d4239acdbdeae5aff779fc))
+* fix linting ([ccf6a46](https://github.com/defenseunicorns/uds-package-jenkins/commit/ccf6a46acbe0232816e89b297fd3f5c5e1358534))
+* fix linting ([5b3bdc8](https://github.com/defenseunicorns/uds-package-jenkins/commit/5b3bdc892cae4cc6cea753e5a27bc789e4e95e04))
+* fix linting ([fd91694](https://github.com/defenseunicorns/uds-package-jenkins/commit/fd91694c1dde42aa4283c7a86f9cb23bd85ce0fe))
+* fix linting ([52d1dd3](https://github.com/defenseunicorns/uds-package-jenkins/commit/52d1dd333a058a717e021537e52aa4170d531da8))
+* fix typo ([c97cad5](https://github.com/defenseunicorns/uds-package-jenkins/commit/c97cad5040f8e25d360daf7d764632ae628d4033))
+* fix typo ([cdd45a7](https://github.com/defenseunicorns/uds-package-jenkins/commit/cdd45a7eda4f4456e5ec8d0017346b8033d9257d))
+* fix typo ([6378a05](https://github.com/defenseunicorns/uds-package-jenkins/commit/6378a05ae7a1f3fba724821413530bc15638daf1))
+* **main:** update release please config ([378439f](https://github.com/defenseunicorns/uds-package-jenkins/commit/378439f340e392b61053244e5225542269b1fc31))
+* **main:** update release.yaml ([9a5189a](https://github.com/defenseunicorns/uds-package-jenkins/commit/9a5189ae4a2094993afa164e40ceaf150caa0017))
+* **main:** update release.yaml ([8fc654d](https://github.com/defenseunicorns/uds-package-jenkins/commit/8fc654d799ba39da958335b67cf957652c86295f))
+* **main:** update scorecard ([73fe56e](https://github.com/defenseunicorns/uds-package-jenkins/commit/73fe56eb15bdf081ba22f8ce2d8b764ccb1bd51e))
+* **main:** update test.yaml ([afe1f5f](https://github.com/defenseunicorns/uds-package-jenkins/commit/afe1f5fcb37b0e154764abde278d73ade6310bd4))
+* **main:** update test.yaml ([c7e8e38](https://github.com/defenseunicorns/uds-package-jenkins/commit/c7e8e38160985b05a0b6a306944f90c87b7c951d))
+* release unicorn flavor ([a5c5c0a](https://github.com/defenseunicorns/uds-package-jenkins/commit/a5c5c0a6239a41f1fddef90e48c2e222e592a80a))
+* release unicorn flavor ([8c4ae35](https://github.com/defenseunicorns/uds-package-jenkins/commit/8c4ae3536d6cd615724a66b1c65cba2a2bcc3823))
+* remove unecessary files ([a567e77](https://github.com/defenseunicorns/uds-package-jenkins/commit/a567e771f9f7388baa4370597a2f748e489b7765))
+* update CODEOWNERS ([#82](https://github.com/defenseunicorns/uds-package-jenkins/issues/82)) ([38acd84](https://github.com/defenseunicorns/uds-package-jenkins/commit/38acd840b8f20697d1ee9508862705fccca5c9ee))
+* update dependencies ([9a64c0f](https://github.com/defenseunicorns/uds-package-jenkins/commit/9a64c0ff2940eb3643eaa6d73b6a27f9c3825556))
+
 ## [5.6.1-uds.0](https://github.com/defenseunicorns/uds-package-jenkins/compare/v5.5.14-uds.1...v5.6.1-uds.0) (2024-09-17)
 
 

CODEOWNERS

@@ -1,2 +1,4 @@
-# This repository is owned by the Defense Unicorns UDS-Marketplace Team
-/* @defenseunicorns/uds-marketplace @defenseunicorns/task-force-narwhal
+/* @defenseunicorns/uds-package-maintainers @Michael-Kruggel @mkborland
+
+/CODEOWNERS @defenseunicorns/uds-package-maintainers
+/LICENS* @jeff-mccoy @austenbryan