refactor: simplifies tagging (#82)

Author: jmgilman

actions/install/dist/index.js

@@ -33070,7 +33070,8 @@ const core = __nccwpck_require__(2186);
 const github = __nccwpck_require__(5438);
 const tc = __nccwpck_require__(7784);
 
-const projectName = "cli";
+const assetPrefix = "forge-cli";
+const releaseName = "forge-cli";
 const repoOwner = "input-output-hk";
 const repoName = "catalyst-forge";
 
@@ -33139,7 +33140,7 @@ function getAssetName() {
  throw new Error(`Unsupported platform: ${platform}`);
  }
 
- return `${projectName}-${platformSuffix}.tar.gz`;
+ return `${assetPrefix}-${platformSuffix}.tar.gz`;
 }
 
 /**
@@ -33187,7 +33188,7 @@ async function getVersionedAsset(octokit, version) {
  const releases = await getReleases(octokit);
 
  const targetRelease = releases.find(
- (r) => r.tag_name === `${projectName}/v${version}`,
+ (r) => r.tag_name === `${releaseName}/v${version}`,
  );
  if (!targetRelease) {
  throw new Error(`Version ${version} not found`);

actions/install/dist/index.js.map

@@ -2,7 +2,8 @@ const core = require("@actions/core");
 const github = require("@actions/github");
 const tc = require("@actions/tool-cache");
 
-const projectName = "cli";
+const assetPrefix = "forge-cli";
+const releaseName = "forge-cli";
 const repoOwner = "input-output-hk";
 const repoName = "catalyst-forge";
 
@@ -71,7 +72,7 @@ function getAssetName() {
  throw new Error(`Unsupported platform: ${platform}`);
  }
 
- return `${projectName}-${platformSuffix}.tar.gz`;
+ return `${assetPrefix}-${platformSuffix}.tar.gz`;
 }
 
 /**
@@ -119,7 +120,7 @@ async function getVersionedAsset(octokit, version) {
  const releases = await getReleases(octokit);
 
  const targetRelease = releases.find(
- (r) => r.tag_name === `${projectName}/v${version}`,
+ (r) => r.tag_name === `${releaseName}/v${version}`,
  );
  if (!targetRelease) {
  throw new Error(`Version ${version} not found`);

actions/install/src/main.js

@@ -6,8 +6,6 @@ global: {
 "^build(-.*)?$",
 "^package(-.*)?$",
 "^test(-.*)?$",
-"^release(-.*)?$",
-"^publish(-.*)?$",
 ]
 registries: [
 ci.providers.aws.registry,
@@ -49,12 +47,6 @@ global: {
 path: "GITHUB_TOKEN"
 },
 ]
-tagging: {
-aliases: {
-forge: "cli"
-}
-strategy: "commit"
-}
 }
 deployment: {
 registry: ci.providers.aws.registry

blueprint.cue

@@ -67,25 +67,3 @@ github:
  --version=$version) bin/forge
 
  SAVE ARTIFACT bin/forge forge
-
-docker:
- FROM debian:bookworm-slim
- WORKDIR /workspace
-
- ARG container="forge"
- ARG tag="latest"
- ARG version="dev"
-
- ARG TARGETOS
- ARG TARGETARCH
- ARG USERPLATFORM
-
- COPY \
- --platform=$USERPLATFORM \
- (+build/forge \
- --GOOS=$TARGETOS \
- --GOARCH=$TARGETARCH \
- --version=$version) /usr/local/bin/forge
-
- ENTRYPOINT ["/usr/local/bin/forge"]
- SAVE IMAGE ${container}:${tag}

cli/Earthfile

@@ -1,16 +1,7 @@
 version: "1.0"
 project: {
-name: "forge"
+name: "forge-cli"
 ci: targets: {
-docker: {
-args: {
-version: string | *"dev" @forge(name="GIT_TAG")
-}
-platforms: [
-"linux/amd64",
-"linux/arm64",
-]
-}
 github: {
 args: {
 version: string | *"dev" @forge(name="GIT_TAG")
@@ -25,16 +16,11 @@ project: {
 test: retries: 3
 }
 release: {
-docker: {
-on: {
-merge: {}
-tag: {}
-}
-config: {}
-}
 github: {
 on: tag: {}
 config: {
+name: string | *"dev" @forge(name="GIT_TAG")
+prefix: project.name
 token: {
 provider: "env"
 path: "GITHUB_TOKEN"

cli/blueprint.cue

@@ -31,7 +31,6 @@ var cli struct {
 Run cmds.RunCmd `kong:"cmd" help:"Run an Earthly target."`
 Scan cmds.ScanCmd `kong:"cmd" help:"Scan for Earthfiles."`
 Secret cmds.SecretCmd `kong:"cmd" help:"Manage secrets."`
-Tag cmds.TagCmd `kong:"cmd" help:"Generate a tag for a project."`
 Validate cmds.ValidateCmd `kong:"cmd" help:"Validates a project."`
 Version VersionCmd `kong:"cmd" help:"Print the version."`
 

cli/cmd/cmds/tag.go

@@ -10,6 +10,9 @@ test
 Image ./dir1+test output as test
 -- earthly_stdout.txt --
 Image ./dir1+test output as test
+-- dir1/blueprint.cue --
+version: "1.0.0"
+project: name: "dir1"
 -- dir1/Earthfile --
 VERSION 0.8
 

cli/cmd/main.go

@@ -14,6 +14,9 @@ Artifact ./dir1+test output as test
 -- earthly_stdout.txt --
 Image ./dir1+test output as test
 Artifact ./dir1+test output as test
+-- dir1/blueprint.cue --
+version: "1.0.0"
+project: name: "dir1"
 -- dir1/Earthfile --
 VERSION 0.8