diff --git a/.github/workflows/gophermart.yml b/.github/workflows/gophermart.yml index b863399..1b8d18b 100644 --- a/.github/workflows/gophermart.yml +++ b/.github/workflows/gophermart.yml @@ -29,14 +29,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Download autotests binaries - uses: robinraju/release-downloader@v1.8 - with: - repository: Yandex-Practicum/go-autotests - tag: "v0.10.1" - fileName: "*" - out-file-path: .tools - - name: Setup autotest binary run: | chmod -R +x $GITHUB_WORKSPACE/.tools diff --git a/.gitignore b/.gitignore index d7f525e..ab7b2fa 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,5 @@ vendor/ .idea .vscode -# test binaries -statictest -random -gophermarttest - # logs *.log \ No newline at end of file diff --git a/.tools/gophermarttest b/.tools/gophermarttest new file mode 100644 index 0000000..b19ba23 Binary files /dev/null and b/.tools/gophermarttest differ diff --git a/.tools/random b/.tools/random new file mode 100644 index 0000000..fff72d0 Binary files /dev/null and b/.tools/random differ diff --git a/.tools/statictest b/.tools/statictest new file mode 100644 index 0000000..1a94441 Binary files /dev/null and b/.tools/statictest differ diff --git a/Makefile b/Makefile index 6013e54..1f05e7f 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,11 @@ race: lint: /home/user/go/bin/golangci-lint run -accrual-port = $(shell ./random unused-port) +accrual-port = $(shell ./.tools/random unused-port) gophermart-bin = ./cmd/gophermart/gophermart autotest: go build -o $(gophermart-bin) ./cmd/gophermart - ./gophermarttest \ + ./.tools/gophermarttest \ -test.v -test.run=^TestGophermart$ \ -gophermart-binary-path=$(gophermart-bin) \ -gophermart-host=localhost \ @@ -39,7 +39,7 @@ cover: rm coverage.out statictest: - go vet -vettool=statictest ./... + go vet -vettool=./.tools/statictest ./... dev-up: docker-compose -f=docker-compose.dev.yml --env-file=.env.dev up -d