wip: cleanup

input-output-hk · Nov 26, 2024 · 5ccb5cb · 5ccb5cb
1 parent 184667c
commit 5ccb5cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/cli/pkg/release/providers/docker_test.go b/cli/pkg/release/providers/docker_test.go
@@ -19,7 +19,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 		container string,
 		registries []string,
 		platforms []string,
-		tag *project.ProjectTag,
 	) project.Project {
 		return project.Project{
 			Blueprint: schema.Blueprint{
@@ -39,7 +38,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 					},
 				},
 			},
-			Tag: tag,
 		}
 	}
 
@@ -66,7 +64,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 				"test",
 				[]string{"test.com"},
 				[]string{},
-				nil,
 			),
 			release: newRelease(),
 			config: DockerReleaserConfig{
@@ -82,37 +79,12 @@ func TestDockerReleaserRelease(t *testing.T) {
 				assert.Contains(t, calls, "push test.com/test:test")
 			},
 		},
-		// {
-		// 	name: "with git tag",
-		// 	project: newProject(
-		// 		"test",
-		// 		[]string{"test.com"},
-		// 		[]string{},
-		// 		&project.ProjectTag{
-		// 			Version: "v1.0.0",
-		// 		},
-		// 	),
-		// 	release: newRelease(),
-		// 	config: DockerReleaserConfig{
-		// 		Tag: "test",
-		// 	},
-		// 	firing:  true,
-		// 	force:   false,
-		// 	runFail: false,
-		// 	validate: func(t *testing.T, calls []string, err error) {
-		// 		require.NoError(t, err)
-		// 		assert.Contains(t, calls, fmt.Sprintf("inspect %s:%s", CONTAINER_NAME, TAG_NAME))
-		// 		assert.Contains(t, calls, fmt.Sprintf("tag %s:%s test.com/test:v1.0.0", CONTAINER_NAME, TAG_NAME))
-		// 		assert.Contains(t, calls, "push test.com/test:v1.0.0")
-		// 	},
-		// },
 		{
 			name: "multiple platforms",
 			project: newProject(
 				"test",
 				[]string{"test.com"},
 				[]string{"linux", "windows"},
-				nil,
 			),
 			release: newRelease(),
 			config: DockerReleaserConfig{
@@ -140,7 +112,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 				"test",
 				[]string{"test.com"},
 				[]string{"linux", "windows"},
-				nil,
 			),
 			release: schema.Release{},
 			config:  DockerReleaserConfig{},
@@ -170,7 +141,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 				"test",
 				[]string{"test.com"},
 				[]string{},
-				nil,
 			),
 			release:    newRelease(),
 			firing:     true,
@@ -189,7 +159,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 				"test",
 				[]string{"test.com"},
 				[]string{},
-				nil,
 			),
 			release: newRelease(),
 			firing:  false,
@@ -206,7 +175,6 @@ func TestDockerReleaserRelease(t *testing.T) {
 				"test",
 				[]string{"test.com"},
 				[]string{},
-				nil,
 			),
 			release: newRelease(),
 			config: DockerReleaserConfig{

diff --git a/foundry/api/blueprint.cue b/foundry/api/blueprint.cue
@@ -29,7 +29,8 @@ project: {
 	release: {
 		docker: {
 			on: {
-				always: {}
+				merge: {}
+				tag: {}
 			}
 			config: {
 				tag: _ @forge(name="GIT_HASH_OR_TAG")