From 524357036b9e6cded1076e6b080f358c0cdaa9b0 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 23 Oct 2024 08:47:09 -0700 Subject: [PATCH 01/36] fix: uses correct id in argocd container --- .github/workflows/release.yml | 10 ++++++++++ tools/argocd/Earthfile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68f5045..d882183 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,5 +75,15 @@ jobs: args: ${{ matrix.release.project }} ${{ matrix.release.name }} local: ${{ inputs.local }} verbosity: ${{ inputs.verbosity }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Release Temp + uses: input-output-hk/catalyst-forge/actions/run@master + if: matrix.release.project == './tools/argocd' + with: + command: release + args: --force ${{ matrix.release.project }} ${{ matrix.release.name }} + local: ${{ inputs.local }} + verbosity: ${{ inputs.verbosity }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index c5e438b..fc4fab5 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -20,7 +20,7 @@ docker: ARG TARGETARCH ARG USERPLATFORM - RUN useradd -m argocd + RUN useradd -m -u 999 argocd USER argocd WORKDIR /home/argocd From 85a855d32a843d6d85300dec360b6301ae66cf7d Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 23 Oct 2024 09:06:57 -0700 Subject: [PATCH 02/36] wip: fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 524f518..c83eb62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,7 @@ jobs: earthly_token: ${{ secrets.earthly_token }} deploy: - uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master + uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@fix-argo-container needs: [discover, check, build, test, release] if: (fromJson(needs.discover.outputs.deployments)[0] != null) && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && !failure() && !cancelled() with: From d018c20edc67b3375712d2e5c5d7eb3b694beeb9 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 23 Oct 2024 09:24:04 -0700 Subject: [PATCH 03/36] wip: fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c83eb62..42510c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: earthly_token: ${{ secrets.earthly_token }} release: - uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@master + uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@fix-argo-container needs: [discover, check, build, test] if: (fromJson(needs.discover.outputs.releases)[0] != null) && !failure() && !cancelled() with: @@ -150,7 +150,7 @@ jobs: earthly_token: ${{ secrets.earthly_token }} deploy: - uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@fix-argo-container + uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master needs: [discover, check, build, test, release] if: (fromJson(needs.discover.outputs.deployments)[0] != null) && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && !failure() && !cancelled() with: From 9aac7a90fb30c662e4a773e903e564eed1076533 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 23 Oct 2024 09:58:15 -0700 Subject: [PATCH 04/36] fix: adds ca certs --- tools/argocd/Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index fc4fab5..52d045e 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -20,6 +20,7 @@ docker: ARG TARGETARCH ARG USERPLATFORM + RUN apt-get update && apt-get install -y ca-certificates RUN useradd -m -u 999 argocd USER argocd From b96428cc57920959ad9bb159f6c655573b364272 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Thu, 24 Oct 2024 11:36:06 +0100 Subject: [PATCH 05/36] Add init.sh script --- tools/argocd/Earthfile | 4 ++-- tools/argocd/helpers/init.sh | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 tools/argocd/helpers/init.sh diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index 52d045e..e7196ed 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -37,7 +37,7 @@ docker: RUN mkdir -p cmp-server/config COPY plugin.yml cmp-server/config/plugin.yaml + COPY init.sh /home/argocd/init.sh + ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server" ] SAVE IMAGE ${container}:${tag} - - diff --git a/tools/argocd/helpers/init.sh b/tools/argocd/helpers/init.sh new file mode 100644 index 0000000..3d28779 --- /dev/null +++ b/tools/argocd/helpers/init.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -o errexit +set -o nounset +set -o pipefail +set -o xtrace + +ACCOUNT_ID=$(echo "${AWS_ROLE_ARN}" | cut -d':' -f5) +mkdir -p /home/argocd/.docker +cat >/home/argocd/.docker/config.json < Date: Thu, 24 Oct 2024 11:41:28 +0100 Subject: [PATCH 06/36] Move to root --- tools/argocd/{helpers => }/init.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/argocd/{helpers => }/init.sh (100%) diff --git a/tools/argocd/helpers/init.sh b/tools/argocd/init.sh similarity index 100% rename from tools/argocd/helpers/init.sh rename to tools/argocd/init.sh From 2d6be7eb613b0629d2381029fac8c40685102e24 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Thu, 24 Oct 2024 11:52:05 +0100 Subject: [PATCH 07/36] Set execute bit --- tools/argocd/Earthfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index e7196ed..276180d 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -38,6 +38,7 @@ docker: COPY plugin.yml cmp-server/config/plugin.yaml COPY init.sh /home/argocd/init.sh + RUN chmod +x /home/argocd/init.sh ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server" ] SAVE IMAGE ${container}:${tag} From 80a0230e0a2cf8a0b87f03090ea3fa7829c15fe6 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Thu, 24 Oct 2024 08:12:35 -0700 Subject: [PATCH 08/36] fix: try version 0.17.0 --- tools/argocd/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index 276180d..700d191 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -3,7 +3,7 @@ VERSION 0.8 timoni: FROM golang:1.23.0 - ARG TIMONI_VERSION=v0.22.1 + ARG TIMONI_VERSION=v0.17.0 WORKDIR /work From cb1295e1c52f04c977e52c33673951f4d9717d78 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Thu, 24 Oct 2024 08:26:54 -0700 Subject: [PATCH 09/36] wip: adds ECR helper --- tools/argocd/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index 700d191..b31dd56 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -20,7 +20,7 @@ docker: ARG TARGETARCH ARG USERPLATFORM - RUN apt-get update && apt-get install -y ca-certificates + RUN apt-get update && apt-get install -y ca-certificates amazon-ecr-credential-helper RUN useradd -m -u 999 argocd USER argocd From 622f5b197dd5c1d51f5dcac7d8d8bd206d67706f Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Tue, 29 Oct 2024 09:03:35 +0000 Subject: [PATCH 10/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 00d8c23..00c6a9c 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -17,7 +17,7 @@ project: { environment: "dev" modules: main: { container: "foundry-api-deployment" - version: "0.1.0" + version: "0.1.1" values: { environment: name: "dev" server: image: { From e4c73cc34f3f4eefd477085ab3ded1f9cb281e3b Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 10:31:17 -0700 Subject: [PATCH 11/36] wip: adds debug flag --- tools/argocd/Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/argocd/Earthfile b/tools/argocd/Earthfile index b31dd56..7616cd5 100644 --- a/tools/argocd/Earthfile +++ b/tools/argocd/Earthfile @@ -40,5 +40,5 @@ docker: COPY init.sh /home/argocd/init.sh RUN chmod +x /home/argocd/init.sh - ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server" ] + ENTRYPOINT [ "/var/run/argocd/argocd-cmp-server", "--loglevel=info" ] SAVE IMAGE ${container}:${tag} From df9c6ac2eed396dff2bdb923f1f6120c78216d76 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 17:22:34 -0700 Subject: [PATCH 12/36] wip: testing --- .github/workflows/release.yml | 2 +- foundry/api/blueprint.cue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d882183..a0336a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Release Temp uses: input-output-hk/catalyst-forge/actions/run@master - if: matrix.release.project == './tools/argocd' + if: matrix.release.project == './foundry/api' with: command: release args: --force ${{ matrix.release.project }} ${{ matrix.release.name }} diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 00c6a9c..d371b00 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -16,6 +16,7 @@ project: { deployment: { environment: "dev" modules: main: { + namespace: string | *"default" @env(name="NAMESPACE",type="string") container: "foundry-api-deployment" version: "0.1.1" values: { From 680725d43e846a3036d9fb61893cc0d9c5538292 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 17:38:46 -0700 Subject: [PATCH 13/36] wip: testing --- .github/workflows/ci.yml | 134 +++++++++++++++++----------------- .github/workflows/release.yml | 3 + 2 files changed, 71 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42510c3..f11f1ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,67 +79,68 @@ jobs: ${{ env.FORGE_REGEX_RELEASE }} ${{ env.FORGE_REGEX_PUBLISH }} - check: - uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master - needs: [discover] - if: (fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$'] != null) && !failure() && !cancelled() - with: - earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$']) }} - forge_version: ${{ inputs.forge_version }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # check: + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # needs: [discover] + # if: (fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$'] != null) && !failure() && !cancelled() + # with: + # earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$']) }} + # forge_version: ${{ inputs.forge_version }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} - build: - uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master - needs: [discover, check] - if: (fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$'] != null) && !failure() && !cancelled() - with: - earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$']) }} - forge_version: ${{ inputs.forge_version }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # build: + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # needs: [discover, check] + # if: (fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$'] != null) && !failure() && !cancelled() + # with: + # earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$']) }} + # forge_version: ${{ inputs.forge_version }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} - package: - uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master - needs: [discover, check, build] - if: (fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$'] != null) && !failure() && !cancelled() - with: - earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$']) }} - forge_version: ${{ inputs.forge_version }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # package: + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # needs: [discover, check, build] + # if: (fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$'] != null) && !failure() && !cancelled() + # with: + # earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$']) }} + # forge_version: ${{ inputs.forge_version }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} - test: - uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master - needs: [discover, check, build, package] - if: (fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$'] != null) && !failure() && !cancelled() - with: - earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$']) }} - forge_version: ${{ inputs.forge_version }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # test: + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # needs: [discover, check, build, package] + # if: (fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$'] != null) && !failure() && !cancelled() + # with: + # earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$']) }} + # forge_version: ${{ inputs.forge_version }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} - docs: - uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@master - needs: [discover, check, build, test] - if: (fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$'] != null) && !failure() && !cancelled() - with: - earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$']) }} - forge_version: ${{ inputs.forge_version }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # docs: + # uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@master + # needs: [discover, check, build, test] + # if: (fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$'] != null) && !failure() && !cancelled() + # with: + # earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$']) }} + # forge_version: ${{ inputs.forge_version }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} release: uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@fix-argo-container - needs: [discover, check, build, test] + #needs: [discover, check, build, test] + needs: [discover] if: (fromJson(needs.discover.outputs.releases)[0] != null) && !failure() && !cancelled() with: releases: ${{ needs.discover.outputs.releases }} @@ -149,20 +150,21 @@ jobs: secrets: earthly_token: ${{ secrets.earthly_token }} - deploy: - uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master - needs: [discover, check, build, test, release] - if: (fromJson(needs.discover.outputs.deployments)[0] != null) && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && !failure() && !cancelled() - with: - deployments: ${{ needs.discover.outputs.deployments }} - forge_version: ${{ inputs.forge_version }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - secrets: - earthly_token: ${{ secrets.earthly_token }} + # deploy: + # uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master + # needs: [discover, check, build, test, release] + # if: (fromJson(needs.discover.outputs.deployments)[0] != null) && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && !failure() && !cancelled() + # with: + # deployments: ${{ needs.discover.outputs.deployments }} + # forge_version: ${{ inputs.forge_version }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # secrets: + # earthly_token: ${{ secrets.earthly_token }} final: - needs: [check, build, package, test, release] + #needs: [check, build, package, test, release] + needs: [discover] if: (!failure() && !cancelled()) runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0336a9..c594847 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,6 +77,9 @@ jobs: verbosity: ${{ inputs.verbosity }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: test + run: | + echo "${{ matrix.release.project }}" - name: Release Temp uses: input-output-hk/catalyst-forge/actions/run@master if: matrix.release.project == './foundry/api' From c5265f3e0b8c6a843e3de4a66659533ee6f5cd2d Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 17:43:24 -0700 Subject: [PATCH 14/36] wip: testing --- .github/workflows/ci.yml | 22 +++++++++++----------- .github/workflows/deploy.yml | 8 ++++---- .github/workflows/docs.yml | 8 ++++---- .github/workflows/release.yml | 13 +++++-------- .github/workflows/run.yml | 8 ++++---- 5 files changed, 28 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f11f1ac..1298edf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,12 +41,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Forge - uses: input-output-hk/catalyst-forge/actions/install@master + uses: input-output-hk/catalyst-forge/actions/install@mve if: ${{ inputs.forge_version != 'local' }} with: version: ${{ inputs.forge_version }} - name: Install Local Forge - uses: input-output-hk/catalyst-forge/actions/install-local@master + uses: input-output-hk/catalyst-forge/actions/install-local@mve if: ${{ inputs.forge_version == 'local' }} with: earthly_token: ${{ secrets.earthly_token }} @@ -61,14 +61,14 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - name: Setup CI - uses: input-output-hk/catalyst-forge/actions/setup@master + uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_docker: 'true' skip_github: 'true' skip_earthly: ${{ steps.local.outputs.skip }} - name: Discovery id: discovery - uses: input-output-hk/catalyst-forge/actions/discovery@master + uses: input-output-hk/catalyst-forge/actions/discovery@mve with: filters: | ${{ env.FORGE_REGEX_CHECK }} @@ -80,7 +80,7 @@ jobs: ${{ env.FORGE_REGEX_PUBLISH }} # check: - # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@mve # needs: [discover] # if: (fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$'] != null) && !failure() && !cancelled() # with: @@ -92,7 +92,7 @@ jobs: # earthly_token: ${{ secrets.earthly_token }} # build: - # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@mve # needs: [discover, check] # if: (fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$'] != null) && !failure() && !cancelled() # with: @@ -104,7 +104,7 @@ jobs: # earthly_token: ${{ secrets.earthly_token }} # package: - # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@mve # needs: [discover, check, build] # if: (fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$'] != null) && !failure() && !cancelled() # with: @@ -116,7 +116,7 @@ jobs: # earthly_token: ${{ secrets.earthly_token }} # test: - # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@mve # needs: [discover, check, build, package] # if: (fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$'] != null) && !failure() && !cancelled() # with: @@ -128,7 +128,7 @@ jobs: # earthly_token: ${{ secrets.earthly_token }} # docs: - # uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@mve # needs: [discover, check, build, test] # if: (fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$'] != null) && !failure() && !cancelled() # with: @@ -138,7 +138,7 @@ jobs: # earthly_token: ${{ secrets.earthly_token }} release: - uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@fix-argo-container + uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@mve #needs: [discover, check, build, test] needs: [discover] if: (fromJson(needs.discover.outputs.releases)[0] != null) && !failure() && !cancelled() @@ -151,7 +151,7 @@ jobs: earthly_token: ${{ secrets.earthly_token }} # deploy: - # uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master + # uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@mve # needs: [discover, check, build, test, release] # if: (fromJson(needs.discover.outputs.deployments)[0] != null) && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && !failure() && !cancelled() # with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 026cd7a..2be399e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,12 +41,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Forge - uses: input-output-hk/catalyst-forge/actions/install@master + uses: input-output-hk/catalyst-forge/actions/install@mve if: ${{ inputs.forge_version != 'local' }} with: version: ${{ inputs.forge_version }} - name: Install Local Forge - uses: input-output-hk/catalyst-forge/actions/install-local@master + uses: input-output-hk/catalyst-forge/actions/install-local@mve if: ${{ inputs.forge_version == 'local' }} with: earthly_token: ${{ secrets.earthly_token }} @@ -61,11 +61,11 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - name: Setup CI - uses: input-output-hk/catalyst-forge/actions/setup@master + uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - name: Deploy - uses: input-output-hk/catalyst-forge/actions/run@master + uses: input-output-hk/catalyst-forge/actions/run@mve with: command: deploy push args: ${{ matrix.deployment }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 80361ce..d505325 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -44,12 +44,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Forge - uses: input-output-hk/catalyst-forge/actions/install@master + uses: input-output-hk/catalyst-forge/actions/install@mve if: ${{ inputs.forge_version != 'local' }} with: version: ${{ inputs.forge_version }} - name: Install Local Forge - uses: input-output-hk/catalyst-forge/actions/install-local@master + uses: input-output-hk/catalyst-forge/actions/install-local@mve if: ${{ inputs.forge_version == 'local' }} with: earthly_token: ${{ secrets.earthly_token }} @@ -64,11 +64,11 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - name: Setup CI - uses: input-output-hk/catalyst-forge/actions/setup@master + uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - name: Run - uses: input-output-hk/catalyst-forge/actions/run@master + uses: input-output-hk/catalyst-forge/actions/run@mve with: command: run args: --artifact ${{ env.OUTPUT }} ${{ matrix.earthfile }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c594847..f45e6ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,12 +45,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Forge - uses: input-output-hk/catalyst-forge/actions/install@master + uses: input-output-hk/catalyst-forge/actions/install@mve if: ${{ inputs.forge_version != 'local' }} with: version: ${{ inputs.forge_version }} - name: Install Local Forge - uses: input-output-hk/catalyst-forge/actions/install-local@master + uses: input-output-hk/catalyst-forge/actions/install-local@mve if: ${{ inputs.forge_version == 'local' }} with: earthly_token: ${{ secrets.earthly_token }} @@ -65,11 +65,11 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - name: Setup CI - uses: input-output-hk/catalyst-forge/actions/setup@master + uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - name: Release - uses: input-output-hk/catalyst-forge/actions/run@master + uses: input-output-hk/catalyst-forge/actions/run@mve with: command: release args: ${{ matrix.release.project }} ${{ matrix.release.name }} @@ -77,11 +77,8 @@ jobs: verbosity: ${{ inputs.verbosity }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: test - run: | - echo "${{ matrix.release.project }}" - name: Release Temp - uses: input-output-hk/catalyst-forge/actions/run@master + uses: input-output-hk/catalyst-forge/actions/run@mve if: matrix.release.project == './foundry/api' with: command: release diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 2556a60..12c6dd2 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -42,12 +42,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Forge - uses: input-output-hk/catalyst-forge/actions/install@master + uses: input-output-hk/catalyst-forge/actions/install@mve if: ${{ inputs.forge_version != 'local' }} with: version: ${{ inputs.forge_version }} - name: Install Local Forge - uses: input-output-hk/catalyst-forge/actions/install-local@master + uses: input-output-hk/catalyst-forge/actions/install-local@mve if: ${{ inputs.forge_version == 'local' }} with: earthly_token: ${{ secrets.earthly_token }} @@ -62,11 +62,11 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - name: Setup CI - uses: input-output-hk/catalyst-forge/actions/setup@master + uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - name: Run - uses: input-output-hk/catalyst-forge/actions/run@master + uses: input-output-hk/catalyst-forge/actions/run@mve with: command: run args: ${{ matrix.earthfile }} From 47a66fde2b5df915228a9b6acfab94024f27a1e5 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 19:10:49 -0700 Subject: [PATCH 15/36] wip: testing --- .github/workflows/release.yml | 41 +++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f45e6ae..fe09d3d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,22 +68,25 @@ jobs: uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - - name: Release - uses: input-output-hk/catalyst-forge/actions/run@mve - with: - command: release - args: ${{ matrix.release.project }} ${{ matrix.release.name }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Release Temp - uses: input-output-hk/catalyst-forge/actions/run@mve - if: matrix.release.project == './foundry/api' - with: - command: release - args: --force ${{ matrix.release.project }} ${{ matrix.release.name }} - local: ${{ inputs.local }} - verbosity: ${{ inputs.verbosity }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: test + run: | + git rev-parse FETCH_HEAD + # - name: Release + # uses: input-output-hk/catalyst-forge/actions/run@mve + # with: + # command: release + # args: ${{ matrix.release.project }} ${{ matrix.release.name }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Release Temp + # uses: input-output-hk/catalyst-forge/actions/run@mve + # if: matrix.release.project == './foundry/api' + # with: + # command: release + # args: --force ${{ matrix.release.project }} ${{ matrix.release.name }} + # local: ${{ inputs.local }} + # verbosity: ${{ inputs.verbosity }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 44ba1ac9b3526e309b3fc73456f671fde085db10 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 19:16:36 -0700 Subject: [PATCH 16/36] wip: testing --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe09d3d..81601b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,6 +71,8 @@ jobs: - name: test run: | git rev-parse FETCH_HEAD + git rev-parse HEAD + git rev-parse HEAD^2 # - name: Release # uses: input-output-hk/catalyst-forge/actions/run@mve # with: From 044e3188451633c5b400042b24cdafb216346681 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Tue, 29 Oct 2024 19:21:43 -0700 Subject: [PATCH 17/36] wip: testing --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81601b9..ea2302b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,9 +70,8 @@ jobs: skip_earthly: ${{ steps.local.outputs.skip }} - name: test run: | - git rev-parse FETCH_HEAD - git rev-parse HEAD - git rev-parse HEAD^2 + echo "$GITHUB_EVENT_PATH" + cat "$GITHUB_EVENT_PATH" # - name: Release # uses: input-output-hk/catalyst-forge/actions/run@mve # with: From a129b134b1c4c145206c9e088237a15bbf4c1bc9 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Wed, 30 Oct 2024 18:32:57 -0700 Subject: [PATCH 18/36] wip: use always --- .github/workflows/release.yml | 32 +++++++++----------------------- foundry/api/blueprint.cue | 5 +++-- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea2302b..91e2442 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,26 +68,12 @@ jobs: uses: input-output-hk/catalyst-forge/actions/setup@mve with: skip_earthly: ${{ steps.local.outputs.skip }} - - name: test - run: | - echo "$GITHUB_EVENT_PATH" - cat "$GITHUB_EVENT_PATH" - # - name: Release - # uses: input-output-hk/catalyst-forge/actions/run@mve - # with: - # command: release - # args: ${{ matrix.release.project }} ${{ matrix.release.name }} - # local: ${{ inputs.local }} - # verbosity: ${{ inputs.verbosity }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: Release Temp - # uses: input-output-hk/catalyst-forge/actions/run@mve - # if: matrix.release.project == './foundry/api' - # with: - # command: release - # args: --force ${{ matrix.release.project }} ${{ matrix.release.name }} - # local: ${{ inputs.local }} - # verbosity: ${{ inputs.verbosity }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: Release + uses: input-output-hk/catalyst-forge/actions/run@mve + with: + command: release + args: ${{ matrix.release.project }} ${{ matrix.release.name }} + local: ${{ inputs.local }} + verbosity: ${{ inputs.verbosity }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index d371b00..5da6f0a 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -30,8 +30,9 @@ project: { release: { docker: { on: { - merge: {} - tag: {} + //merge: {} + //tag: {} + always: {} } config: { tag: _ @forge(name="GIT_COMMIT_HASH") From 4bb4a84ce3cd7738cb1109f7982f9b296e9d02c8 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Thu, 31 Oct 2024 11:04:23 -0700 Subject: [PATCH 19/36] wip: switch namespace --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 5da6f0a..b8d7872 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -16,7 +16,7 @@ project: { deployment: { environment: "dev" modules: main: { - namespace: string | *"default" @env(name="NAMESPACE",type="string") + namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-deployment" version: "0.1.1" values: { From f8486e2a496b68842ff64d992a3f1ca9319441b2 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:10:52 +0000 Subject: [PATCH 20/36] Use new deployment module --- foundry/api/blueprint.cue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index b8d7872..87ac9c9 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -17,8 +17,8 @@ project: { environment: "dev" modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") - container: "foundry-api-deployment" - version: "0.1.1" + container: "foundry-api-new-deployment" + version: "0.1.0" values: { environment: name: "dev" server: image: { From bd28f26a682e93a8440414dbe8d3e143211d4158 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:18:12 +0000 Subject: [PATCH 21/36] Use expected data structure --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 87ac9c9..30d5a3a 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -21,7 +21,7 @@ project: { version: "0.1.0" values: { environment: name: "dev" - server: image: { + app: image: { tag: _ @forge(name="GIT_COMMIT_HASH") } } From bcd665407b5b58f1cab159336c1ad66c016059ed Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:19:47 +0000 Subject: [PATCH 22/36] Move environment key to correct place --- foundry/api/blueprint.cue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 30d5a3a..1349fc4 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -20,9 +20,11 @@ project: { container: "foundry-api-new-deployment" version: "0.1.0" values: { - environment: name: "dev" - app: image: { - tag: _ @forge(name="GIT_COMMIT_HASH") + app: { + environment: "dev" + image: { + tag: _ @forge(name="GIT_COMMIT_HASH") + } } } } From 78f2367a334b37d28069105a3d9f222125fc52df Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:28:53 +0000 Subject: [PATCH 23/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 1349fc4..cf1da2e 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.0" + version: "0.1.1" values: { app: { environment: "dev" From b0ea725b8eba22ce89e8bf0cfc4bab27bdbe99e7 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:32:33 +0000 Subject: [PATCH 24/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index cf1da2e..e30eaa3 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.1" + version: "0.1.2" values: { app: { environment: "dev" From 32e4b4bbd5419175ae4ae5bee3855eacdd4e6f49 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Mon, 4 Nov 2024 12:50:15 +0000 Subject: [PATCH 25/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index e30eaa3..8eb1c74 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.2" + version: "0.1.3" values: { app: { environment: "dev" From 625b54bc7b352ec08a48b56301e58952d41e7b38 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 08:45:14 +0000 Subject: [PATCH 26/36] Bump version and specify pre-sync values --- foundry/api/blueprint.cue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 8eb1c74..0848058 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,13 +18,22 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.3" + version: "0.1.4" values: { app: { environment: "dev" image: { tag: _ @forge(name="GIT_COMMIT_HASH") } + presync: { + repoName: "catalyst-forge" + repoOwner: "input-output-hk" + commitHash: @forge(name="GIT_COMMIT_HASH") + gitHubToken: { + name: "ci-bot" + key: "token" + } + } } } } From 2500cadc53a60060996d0670a30eac9550f7c601 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 08:47:52 +0000 Subject: [PATCH 27/36] Fix typo --- foundry/api/blueprint.cue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 0848058..eb2c6c5 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -25,15 +25,15 @@ project: { image: { tag: _ @forge(name="GIT_COMMIT_HASH") } - presync: { - repoName: "catalyst-forge" - repoOwner: "input-output-hk" - commitHash: @forge(name="GIT_COMMIT_HASH") - gitHubToken: { - name: "ci-bot" - key: "token" - } - } + presync: { + repoName: "catalyst-forge" + repoOwner: "input-output-hk" + commitHash: _ @forge(name="GIT_COMMIT_HASH") + gitHubToken: { + name: "ci-bot" + key: "token" + } + } } } } From 979244729b967800b7b3ad1d6f7065da7d7f4282 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 09:03:23 +0000 Subject: [PATCH 28/36] Bump version (again) --- foundry/api/blueprint.cue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index eb2c6c5..3a83688 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.4" + version: "0.1.5" values: { app: { environment: "dev" @@ -33,6 +33,8 @@ project: { name: "ci-bot" key: "token" } + checkInterval: 5 + timeout: 300 } } } From ffc99004e668163dae10779d46e92c49876ad443 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 09:04:42 +0000 Subject: [PATCH 29/36] Fixed typo --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 3a83688..2df6c62 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -29,7 +29,7 @@ project: { repoName: "catalyst-forge" repoOwner: "input-output-hk" commitHash: _ @forge(name="GIT_COMMIT_HASH") - gitHubToken: { + githubToken: { name: "ci-bot" key: "token" } From fc00f59598b3630c145b682a16513ee1498758bc Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 09:47:38 +0000 Subject: [PATCH 30/36] New version --- foundry/api/blueprint.cue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 2df6c62..7f65eea 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.5" + version: "0.1.8" values: { app: { environment: "dev" @@ -26,13 +26,9 @@ project: { tag: _ @forge(name="GIT_COMMIT_HASH") } presync: { - repoName: "catalyst-forge" - repoOwner: "input-output-hk" - commitHash: _ @forge(name="GIT_COMMIT_HASH") - githubToken: { - name: "ci-bot" - key: "token" - } + repoName: "catalyst-forge" + repoOwner: "input-output-hk" + commitHash: _ @forge(name="GIT_COMMIT_HASH") checkInterval: 5 timeout: 300 } From 711bc98b2e5e58da6ecf43c056346b44e11e9486 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 09:50:45 +0000 Subject: [PATCH 31/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 7f65eea..a242761 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.8" + version: "0.1.9" values: { app: { environment: "dev" From 58c8bef3f50b85d878f4e867e87d87730f8ccbda Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 10:10:36 +0000 Subject: [PATCH 32/36] Bumped version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index a242761..ce6303e 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.9" + version: "0.1.11" values: { app: { environment: "dev" From e4085bb16942c4520b195a84e65a5c897780ee7f Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 10:20:46 +0000 Subject: [PATCH 33/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index ce6303e..a41ff4d 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.11" + version: "0.1.12" values: { app: { environment: "dev" From 1cd4a4d0f000e7098d233209e9c87ba2a19000c7 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 10:22:25 +0000 Subject: [PATCH 34/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index a41ff4d..eff2a47 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.12" + version: "0.1.13" values: { app: { environment: "dev" From 6449591a7e1178ae58267064aea71bc9d0e4b34c Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 10:29:02 +0000 Subject: [PATCH 35/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index eff2a47..13b0ce1 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.13" + version: "0.1.14" values: { app: { environment: "dev" From 38a3f406f27b259d2cde48a6206819389dbe7cb4 Mon Sep 17 00:00:00 2001 From: benbooth493 Date: Wed, 6 Nov 2024 10:31:05 +0000 Subject: [PATCH 36/36] Bump version --- foundry/api/blueprint.cue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue index 13b0ce1..f53fca7 100644 --- a/foundry/api/blueprint.cue +++ b/foundry/api/blueprint.cue @@ -18,7 +18,7 @@ project: { modules: main: { namespace: string | *"default" @env(name="ARGOCD_APP_NAMESPACE",type="string") container: "foundry-api-new-deployment" - version: "0.1.14" + version: "0.1.15" values: { app: { environment: "dev"