From 7e7b7f5cbce2e418d68d1fe2591427a12617a523 Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sat, 2 Apr 2022 07:31:52 +0200 Subject: [PATCH 1/5] chore(NORELEASE): Add "security" category to semantics --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c55e2e..11bcb3a 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ lint: fail-on-errors vet: ERRORS=$(shell go vet) vet: fail-on-errors -semantic: REGEX:="^(feat|fix|docs|style|refactor|test|chore|localize)(\([a-zA-Z0-9\/_-]+\))?: [a-zA-Z]" +semantic: REGEX:="^(feat|fix|docs|style|refactor|test|chore|localize|security)(\([a-zA-Z0-9\/_-]+\))?: [a-zA-Z]" semantic: @if [[ -n "${RANGE}" ]]; then \ git log --pretty="format:%s" ${RANGE} | egrep -v "(Merge pull request|Merge branch)" \ From caa59e950a6d910073dd521cdb723d6d6ac8519d Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sat, 2 Apr 2022 07:12:32 +0200 Subject: [PATCH 2/5] security(issue-234): Do NOT package current directory --- scripts/github-upload-assets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/github-upload-assets.sh b/scripts/github-upload-assets.sh index c4595eb..047e69a 100755 --- a/scripts/github-upload-assets.sh +++ b/scripts/github-upload-assets.sh @@ -23,7 +23,7 @@ ID=$(curl -s -H "Authorization: Token ${GITHUB_TOKEN}" "${API_URL}/tags/${TAG}" pushd "${ASSETS_PATH}" for DIR in $(find -mindepth 1 -maxdepth 1 -type d); do - tar -C "${DIR}" -zc . -f "${DIR}-$(cat ../release/NAME).tar.gz" + tar -C "${DIR}" -zc lstags -f "${DIR}-$(cat ../release/NAME).tar.gz" done for FILE in $(find -mindepth 1 -maxdepth 1 -type f); do From 48f1ca2374f2c98bc972c9cc1e4e1ba83dfb18b5 Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sat, 2 Apr 2022 07:34:24 +0200 Subject: [PATCH 3/5] chore(release): Update golang to 1.17 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 71c2cd0..34504fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build_test_release: working_directory: /go/src/github.com/ivanilves/lstags docker: - - image: circleci/golang:1.13 + - image: circleci/golang:1.17 environment: DOCKERHUB_USERNAME: ivanilves DOCKERHUB_PRIVATE_REPO: ivanilves/private-dummy From 670071abd5593d66daf5d21154b5226d0b82e838 Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sat, 2 Apr 2022 08:44:31 +0200 Subject: [PATCH 4/5] chore(NORELEASE): Use absolute project path for overalls --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 11bcb3a..c1238d6 100644 --- a/Makefile +++ b/Makefile @@ -40,10 +40,9 @@ whitebox-integration-test: | xargs -I {} dirname {} \ | xargs -I {} bash -c "pushd {}; go test -v -cover || exit 1; popd" -coverage: PROJECT:=github.com/ivanilves/lstags coverage: SERVICE:=ci coverage: - @overalls -project=${PROJECT} -covermode=count \ + @overalls -project=${PWD} -covermode=count \ && if [[ -n "${COVERALLS_REPO_TOKEN}" ]]; then goveralls -coverprofile=overalls.coverprofile -repotoken ${COVERALLS_REPO_TOKEN} -service=${SERVICE}; fi blackbox-integration-test: shell-test-alpine shell-test-wrong-image \ From aee674194869c80ece0a637b5e19465f5b506016 Mon Sep 17 00:00:00 2001 From: Ivan Ilves Date: Sat, 2 Apr 2022 08:51:02 +0200 Subject: [PATCH 5/5] chore(release): remove DockerHub-related blackbox tests (unreliable) --- .circleci/config.yml | 1 + Makefile | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34504fe..8e49e0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,7 @@ jobs: environment: DOCKERHUB_USERNAME: ivanilves DOCKERHUB_PRIVATE_REPO: ivanilves/private-dummy + CONCURRENT_REQUESTS: "4" steps: - setup_remote_docker - run: diff --git a/Makefile b/Makefile index c1238d6..8bf973a 100644 --- a/Makefile +++ b/Makefile @@ -45,14 +45,7 @@ coverage: @overalls -project=${PWD} -covermode=count \ && if [[ -n "${COVERALLS_REPO_TOKEN}" ]]; then goveralls -coverprofile=overalls.coverprofile -repotoken ${COVERALLS_REPO_TOKEN} -service=${SERVICE}; fi -blackbox-integration-test: shell-test-alpine shell-test-wrong-image \ - shell-test-docker-socket shell-test-docker-tcp shell-test-pullpush - -shell-test-alpine: - ./lstags alpine | egrep "\salpine:latest" - -shell-test-wrong-image: - ./lstags nobody/nothing &>/dev/null && exit 1 || true +blackbox-integration-test: shell-test-docker-socket shell-test-docker-tcp shell-test-pullpush shell-test-docker-socket: unset DOCKER_HOST && ./lstags alpine~/latest/