diff --git a/.github/workflows/lint_and_test.yaml b/.github/workflows/lint_and_test.yaml index 4a578bf..c7402b4 100644 --- a/.github/workflows/lint_and_test.yaml +++ b/.github/workflows/lint_and_test.yaml @@ -11,47 +11,13 @@ jobs: with: go-version: ^1.21 - uses: actions/checkout@v4 - - name: setup asdf - uses: asdf-vm/actions/setup@6278efebb38ae025cc91dd008910f549e775a8c8 - - name: set env ASDF_PYTHON_DEFAULT_PACKAGES_FILE - run: | - export ASDF_PYTHON_DEFAULT_PACKAGES_FILE=$(pwd) - echo "legacy_version_file = yes" > ~/.asdfrc - - name: asdf cache - id: asdf_cache_id - uses: actions/cache@v4 - with: - path: ~/.asdf - key: ${{ runner.os }}-asdf-${{ hashFiles('.tool-versions') }} - restore-keys: | - ${{ runner.os }}-asdf- - - name: asdf install - if: steps.asdf_cache_id.outputs.cache-hit != 'true' - uses: asdf-vm/actions/install@6278efebb38ae025cc91dd008910f549e775a8c8 + - uses: jdx/mise-action@v2 + - name: go mod tidy + run: go mod tidy + - name: make install go tools + run: make install-go-tools - name: pre-commit install run: pre-commit install - - name: asdf go cache - id: asdf_go_cache_id - uses: actions/cache@v4 - with: - path: ~/.asdf/installs/golang - key: ${{ runner.os }}-asdf-${{ hashFiles('.tool-versions') }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-asdf-go- - - name: go mod tidy and install - if: steps.asdf_go_cache_id.outputs.cache-hit != 'true' - run: | - go mod tidy - make install-go-tools - - name: go mod cache - uses: actions/cache@v4 - with: - path: | - ~/go/pkg/mod - ~/.cache/go-build - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/Makefile b/Makefile index 3bdaa3d..76bf061 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ GOTEST=$(GOCMD) test GOVET=$(GOCMD) vet BINARY_NAME=xk6-gtp # brunch name version -VERSION := 0.0.1 +VERSION := v0.0.1 DOCKER_REGISTRY?= ghcr.io/bbsakura/ DIFF_FROM_BRANCH_NAME ?= origin/main @@ -65,15 +65,13 @@ docker-release: ## Release the container with tag latest and version ## Golang: install-go-tools: ## install project go tools cat tools.go | awk -F'"' '/_/ {print $$2s}' | xargs -tI {} go install {} - asdf reshim golang go-gen: ## go:generate invocations go generate ./... -## ASDF: +## mise: install-dev-pkg: ## install .tool-version - awk '{print $$1}' .tool-versions | xargs -I{} asdf plugin add {} || true - asdf install + mise install ## Help: help: ## Show this help.