From f5d95035f45af58a45535b9076eb5308aaa1a702 Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 14:19:43 -0500 Subject: [PATCH 1/7] chore: use goreleaser directly --- .gitlab-ci.yml | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f04e3758d..9559429c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,9 +134,6 @@ run_tests: .release: stage: release - image: docker:stable - services: - - docker:dind variables: # Disable shallow cloning so that goreleaser can diff between tags to # generate a changelog. @@ -154,13 +151,10 @@ release_test: when: never - changes: - .goreleaser.yml + before_script: | + go install github.com/goreleaser/goreleaser/v2@latest script: | - docker run --rm --privileged \ - -v $PWD:/go/src/gitlab.com/gitlab-org/cli \ - -e GO_VERSION="$GO_VERSION" \ - -w /go/src/gitlab.com/gitlab-org/cli \ - -v /var/run/docker.sock:/var/run/docker.sock \ - goreleaser/goreleaser release --snapshot + goreleaser/goreleaser release --snapshot release: extends: .release @@ -171,20 +165,13 @@ release: # we only want to build from the canonical project so we don't really # need to bother about this being compatible with forks. - 'saas-linux-2xlarge-amd64' + before_script: | + go install github.com/goreleaser/goreleaser/v2@latest script: | - docker run --rm --privileged \ - -v $PWD:/go/src/gitlab.com/gitlab-org/cli \ - -w /go/src/gitlab.com/gitlab-org/cli \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e GO_VERSION="$GO_VERSION" \ - -e GITLAB_TOKEN=$GITLAB_TOKEN_RELEASE \ - --entrypoint "" \ - goreleaser/goreleaser \ - bash -c " - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $DOCKER_IO_USER -p $DOCKER_IO_PASSWORD - goreleaser release - " + - goreleaser/goreleaser + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u $DOCKER_IO_USER -p $DOCKER_IO_PASSWORD + - goreleaser release homebrew-release: image: homebrew/ubuntu22.04:latest -- GitLab From 6c90a5ea1c2f9b59148f2997ae8d73a9d2779ee8 Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 14:21:59 -0500 Subject: [PATCH 2/7] so we can test --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9559429c6..5e8d79037 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,6 +145,7 @@ release_test: extends: .release stage: release rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_TAG -- GitLab From 24b681613c646526a449931adf4a1f4c0bcbca9c Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 14:41:30 -0500 Subject: [PATCH 3/7] still testing --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e8d79037..50643d75e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,6 +193,7 @@ windows_installer: name: amake/innosetup entrypoint: [""] rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_TAG - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -213,6 +214,7 @@ build_windows: needs: [] extends: .go-cache rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_TAG - if: $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- GitLab From 18246f78913eb54405cf73d5ba85f3b6a17fe163 Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 14:48:05 -0500 Subject: [PATCH 4/7] test --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50643d75e..59a2bba36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,7 @@ release_test: before_script: | go install github.com/goreleaser/goreleaser/v2@latest script: | - goreleaser/goreleaser release --snapshot + goreleaser release --snapshot release: extends: .release @@ -169,7 +169,7 @@ release: before_script: | go install github.com/goreleaser/goreleaser/v2@latest script: | - - goreleaser/goreleaser + - goreleaser - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $DOCKER_IO_USER -p $DOCKER_IO_PASSWORD - goreleaser release -- GitLab From d8362784b1d808df5facad94f0760f775fe6d981 Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 15:14:26 -0500 Subject: [PATCH 5/7] install docker? --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59a2bba36..dafe0742b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,6 +154,17 @@ release_test: - .goreleaser.yml before_script: | go install github.com/goreleaser/goreleaser/v2@latest + apt-get update + apt-get install ca-certificates curl + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ + sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update + apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin script: | goreleaser release --snapshot @@ -168,6 +179,7 @@ release: - 'saas-linux-2xlarge-amd64' before_script: | go install github.com/goreleaser/goreleaser/v2@latest + script: | - goreleaser - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY -- GitLab From 4f3d6c4973528e8719ce731644f7e44d9e67bc7d Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 15:21:19 -0500 Subject: [PATCH 6/7] no sudo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dafe0742b..0986237fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ release_test: echo \ "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ - sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin script: | -- GitLab From 984b08c15b88f9803e6d7865e3de2af16b5725aa Mon Sep 17 00:00:00 2001 From: Kai Armstrong Date: Tue, 8 Oct 2024 15:32:20 -0500 Subject: [PATCH 7/7] debian not ubuntu --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0986237fc..e6ff2f622 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,10 +157,10 @@ release_test: apt-get update apt-get install ca-certificates curl install -m 0755 -d /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc chmod a+r /etc/apt/keyrings/docker.asc echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \ tee /etc/apt/sources.list.d/docker.list > /dev/null apt-get update -- GitLab