From cb447ae4e6547a832914ca622502e3b448c86c01 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Mon, 9 Jan 2023 12:17:55 -0500 Subject: [PATCH] remove circleci and unneeded makefile variables (#561) --- .circleci/config.yml | 38 -------------------------------------- Makefile | 11 ----------- 2 files changed, 49 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 2ea093531..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 2 -jobs: - build: - docker: - - image: cimg/go:1.18 - - environment: - TEST_RESULTS: /tmp/test-results # path to where test results will be saved - - steps: - - checkout - - run: mkdir -p $TEST_RESULTS # create the test results directory - - run: - name: "checksum for cache" - command: | - find . -name 'go.sum' | xargs cat > .combined-go.sum - - - restore_cache: # restores saved cache if no changes are detected since last run - keys: - - go-pkg-mod-{{ checksum ".combined-go.sum" }} - - - run: - name: "Precommit and Coverage Report" - command: | - make ci - find . -name 'coverage.html' | xargs -I{} cp --parents "{}" $TEST_RESULTS - - - save_cache: - key: go-pkg-mod-{{ checksum ".combined-go.sum" }} - paths: - - "/go/pkg/mod" - - - store_artifacts: - path: /tmp/test-results - destination: opentelemetry-operations-go-test-output - - - store_test_results: - path: /tmp/test-results diff --git a/Makefile b/Makefile index 2c07694d8..859d57967 100644 --- a/Makefile +++ b/Makefile @@ -7,20 +7,9 @@ ALL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name ' ALL_GO_FILES_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name '*.go' -exec dirname {} \; | sort | uniq)) ALL_COVERAGE_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | grep -E -v '^./example|^$(TOOLS_MOD_DIR)' | sort) -# Mac OS Catalina 10.5.x doesn't support 386. Hence skip 386 test -SKIP_386_TEST = false -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) - SW_VERS := $(shell sw_vers -productVersion) - ifeq ($(shell echo $(SW_VERS) | grep -E '^(10.1[5-9]|1[1-9]|[2-9])'), $(SW_VERS)) - SKIP_386_TEST = true - endif -endif - GOTEST = go test -v -timeout 70s GOTEST_SHORT = $(GOTEST) -short GOTEST_RACE = $(GOTEST) -race -GOTEST_WITH_COVERAGE = $(GOTEST_RACE) -coverprofile=coverage.txt -covermode=atomic .DEFAULT_GOAL := precommit