From 7c4f18fbe076c62a45e693c0348820fa9bcd2c98 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Thu, 30 Nov 2023 19:22:24 +0000 Subject: [PATCH] fix: made versions uniform and fix publish in ci --- .github/workflows/publish-package.yml | 12 ++++++++---- utils/pkg-deps/gitlab/minio/zarf.yaml | 4 +++- utils/pkg-deps/gitlab/postgres/zarf.yaml | 4 +++- utils/pkg-deps/gitlab/redis/zarf.yaml | 4 +++- utils/pkg-deps/namespaces/zarf.yaml | 4 +++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 0ef9bed..2df5090 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -26,16 +26,20 @@ jobs: registry1-password: ${{ secrets.REGISTRY1_PASSWORD }} - name: Build and publish dev-dependency gitlab-postgres package - run: build/zarf package publish zarf-package-gitlab-postgres-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + run: ./zarf package publish zarf-package-gitlab-postgres-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + working-directory: build - name: Build and publish dev-dependency gitlab-redis package - run: build/zarf package publish zarf-package-gitlab-redis-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + run: ./zarf package publish zarf-package-gitlab-redis-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + working-directory: build - name: Build and publish dev-dependency gitlab-minio package - run: build/zarf package publish zarf-package-gitlab-minio-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + run: ./zarf package publish zarf-package-gitlab-minio-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability/gitlab/dev-dependency --no-progress + working-directory: build - name: Publish gitlab package - run: build/zarf package publish zarf-package-gitlab-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability --no-progress + run: ./zarf package publish zarf-package-gitlab-amd64-*.tar.zst oci://ghcr.io/defenseunicorns/uds-capability --no-progress + working-directory: build - name: Publish gitlab skeleton run: build/zarf package publish . oci://ghcr.io/defenseunicorns/uds-capability --no-progress diff --git a/utils/pkg-deps/gitlab/minio/zarf.yaml b/utils/pkg-deps/gitlab/minio/zarf.yaml index 57a2da2..6a40646 100644 --- a/utils/pkg-deps/gitlab/minio/zarf.yaml +++ b/utils/pkg-deps/gitlab/minio/zarf.yaml @@ -2,7 +2,9 @@ kind: ZarfPackageConfig metadata: name: gitlab-minio - version: "0.0.2" + # x-release-please-start-version + version: "0.1.8" + # x-release-please-end architecture: amd64 components: diff --git a/utils/pkg-deps/gitlab/postgres/zarf.yaml b/utils/pkg-deps/gitlab/postgres/zarf.yaml index e2d476f..03da7ed 100644 --- a/utils/pkg-deps/gitlab/postgres/zarf.yaml +++ b/utils/pkg-deps/gitlab/postgres/zarf.yaml @@ -2,7 +2,9 @@ kind: ZarfPackageConfig metadata: name: gitlab-postgres - version: "0.0.2" + # x-release-please-start-version + version: "0.1.8" + # x-release-please-end architecture: amd64 components: diff --git a/utils/pkg-deps/gitlab/redis/zarf.yaml b/utils/pkg-deps/gitlab/redis/zarf.yaml index 31a2e49..5cc3aff 100644 --- a/utils/pkg-deps/gitlab/redis/zarf.yaml +++ b/utils/pkg-deps/gitlab/redis/zarf.yaml @@ -2,7 +2,9 @@ kind: ZarfPackageConfig metadata: name: gitlab-redis - version: "0.0.2" + # x-release-please-start-version + version: "0.1.8" + # x-release-please-end architecture: amd64 components: diff --git a/utils/pkg-deps/namespaces/zarf.yaml b/utils/pkg-deps/namespaces/zarf.yaml index 110c667..584fb33 100644 --- a/utils/pkg-deps/namespaces/zarf.yaml +++ b/utils/pkg-deps/namespaces/zarf.yaml @@ -3,7 +3,9 @@ kind: ZarfPackageConfig metadata: name: gitlab-namespaces description: "package used to deploy needed namespaces" - version: "0.0.1" + # x-release-please-start-version + version: "0.1.8" + # x-release-please-end architecture: amd64 components: