From 6ac540252671f4da5d8d7769a9d482fbca76ffb8 Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 17:29:49 +0000 Subject: [PATCH 1/7] Remove cmd suffix from the repo name --- .github/workflows/docker.yml | 2 +- Justfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b53a1e0..5213111 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -40,5 +40,5 @@ jobs: - name: Run a ko build run: just build-release env: - KO_DOCKER_REPO: ghcr.io/cofide/cofidectl-debug-container/cmd + KO_DOCKER_REPO: ghcr.io/cofide/cofidectl-debug-container GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Justfile b/Justfile index 46ac2b9..c208607 100644 --- a/Justfile +++ b/Justfile @@ -21,8 +21,8 @@ check-deps: # Build build: check-deps - ko build github.com/cofide/cofidectl-debug-container/cmd + ko build github.com/cofide/cofidectl-debug-container # Build application build-release: check-deps - ko build --bare --tags="$KO_TAG" github.com/cofide/cofidectl-debug-container/cmd + ko build --bare --tags="$KO_TAG" github.com/cofide/cofidectl-debug-container From 884626714d4bbe827d502275de821ee8231633c7 Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:13:49 +0000 Subject: [PATCH 2/7] Re-add /cmd suffix in Justfile --- .github/workflows/docker.yml | 2 +- Justfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5213111..7e5316e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -41,4 +41,4 @@ jobs: run: just build-release env: KO_DOCKER_REPO: ghcr.io/cofide/cofidectl-debug-container - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Justfile b/Justfile index c208607..46ac2b9 100644 --- a/Justfile +++ b/Justfile @@ -21,8 +21,8 @@ check-deps: # Build build: check-deps - ko build github.com/cofide/cofidectl-debug-container + ko build github.com/cofide/cofidectl-debug-container/cmd # Build application build-release: check-deps - ko build --bare --tags="$KO_TAG" github.com/cofide/cofidectl-debug-container + ko build --bare --tags="$KO_TAG" github.com/cofide/cofidectl-debug-container/cmd From 5ddc33553d5fae1f8182a545464ebd734a4a5247 Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:18:27 +0000 Subject: [PATCH 3/7] Test cmd removal --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7e5316e..6a0c6b9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ on: push: branches: - main - release: + # release: jobs: build-test: @@ -35,7 +35,7 @@ jobs: - name: Set KO_TAG to the current commit run: echo "KO_TAG=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Set KO_TAG to version if it is a release - if: github.event_name == 'release' + # if: github.event_name == 'release' run: echo "KO_TAG=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV - name: Run a ko build run: just build-release From 9ac70ed82ba50fb4faf88aaee418c4a337321c4e Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:19:21 +0000 Subject: [PATCH 4/7] Temporary branch modification --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6a0c6b9..b8b620f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: docker-image on: push: branches: - - main + - feat-remove-cmd-suffix # release: jobs: From 347fcb7bc32b92f05cbfb68dd2ed7738359e17ea Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:21:32 +0000 Subject: [PATCH 5/7] Revert testing changes --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b8b620f..7e5316e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,8 +2,8 @@ name: docker-image on: push: branches: - - feat-remove-cmd-suffix - # release: + - main + release: jobs: build-test: @@ -35,7 +35,7 @@ jobs: - name: Set KO_TAG to the current commit run: echo "KO_TAG=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Set KO_TAG to version if it is a release - # if: github.event_name == 'release' + if: github.event_name == 'release' run: echo "KO_TAG=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV - name: Run a ko build run: just build-release From aa2a64e0f499c447496bdd3bd87a2af91c3ae5e6 Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:36:44 +0000 Subject: [PATCH 6/7] Push v0.1.0 tagged image --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7e5316e..10c343e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: docker-image on: push: branches: - - main + - feat-remove-cmd-suffix release: jobs: @@ -33,7 +33,7 @@ jobs: run: | go mod download - name: Set KO_TAG to the current commit - run: echo "KO_TAG=$(git rev-parse HEAD)" >> $GITHUB_ENV + run: echo "KO_TAG=v0.1.0" >> $GITHUB_ENV - name: Set KO_TAG to version if it is a release if: github.event_name == 'release' run: echo "KO_TAG=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV From 7694b942a27cb170fd091bd8b7816dc54515de60 Mon Sep 17 00:00:00 2001 From: nialdaly Date: Mon, 23 Dec 2024 19:39:22 +0000 Subject: [PATCH 7/7] Revert temporary changes --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 10c343e..7e5316e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,7 @@ name: docker-image on: push: branches: - - feat-remove-cmd-suffix + - main release: jobs: @@ -33,7 +33,7 @@ jobs: run: | go mod download - name: Set KO_TAG to the current commit - run: echo "KO_TAG=v0.1.0" >> $GITHUB_ENV + run: echo "KO_TAG=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Set KO_TAG to version if it is a release if: github.event_name == 'release' run: echo "KO_TAG=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV