From e641c37e80b4f6d30d53c3c0a947c93a9f143544 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Mon, 21 Oct 2024 19:40:23 -0700 Subject: [PATCH] wip: update --- .github/workflows/ci.yml | 4 ++-- examples/go/blueprint.cue | 9 +++++++-- examples/rust/blueprint.cue | 5 +++++ users/jmgilman/blueprint.cue | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8bf076..fe024db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,6 @@ permissions: packages: write jobs: ci: - uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.2.0 + uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@master with: - forge_version: 0.3.0 \ No newline at end of file + forge_version: 0.4.0 \ No newline at end of file diff --git a/examples/go/blueprint.cue b/examples/go/blueprint.cue index bc33cfc..9b6a53a 100644 --- a/examples/go/blueprint.cue +++ b/examples/go/blueprint.cue @@ -4,7 +4,7 @@ project: { ci: targets: { publish: { args: { - version: string | *"v0.0.0" @env(name="GIT_TAG",type="string") + version: string | *"v0.0.0" @env(name="GIT_TAG_VERSION",type="string") } platforms: [ "linux/amd64", @@ -13,7 +13,7 @@ project: { } release: { args: { - version: string | *"v0.0.0" @env(name="GIT_TAG",type="string") + version: string | *"v0.0.0" @env(name="GIT_TAG_VERSION",type="string") } platforms: [ "linux/amd64", @@ -29,10 +29,15 @@ project: { merge: {} tag: {} } + config: { + tag: _ @forge(name="GIT_COMMIT_HASH") + } } github: { on: tag: {} config: { + name: string | *"dev" @forge(name="GIT_TAG") + prefix: project.name token: { provider: "env" path: "GITHUB_TOKEN" diff --git a/examples/rust/blueprint.cue b/examples/rust/blueprint.cue index 01706e0..901c832 100644 --- a/examples/rust/blueprint.cue +++ b/examples/rust/blueprint.cue @@ -26,10 +26,15 @@ project: { merge: {} tag: {} } + config: { + tag: _ @forge(name="GIT_COMMIT_HASH") + } } github: { on: tag: {} config: { + name: string | *"dev" @forge(name="GIT_TAG") + prefix: project.name token: { provider: "env" path: "GITHUB_TOKEN" diff --git a/users/jmgilman/blueprint.cue b/users/jmgilman/blueprint.cue index c2e74b9..2961a80 100644 --- a/users/jmgilman/blueprint.cue +++ b/users/jmgilman/blueprint.cue @@ -7,10 +7,15 @@ project: { merge: {} tag: {} } + config: { + tag: _ @forge(name="GIT_COMMIT_HASH") + } } github: { on: tag: {} config: { + name: string | *"dev" @forge(name="GIT_TAG") + prefix: project.name token: { provider: "env" path: "GITHUB_TOKEN"