From 31eb467aeb4be46970c2cb72764ccd6d6dce218a Mon Sep 17 00:00:00 2001 From: Yevgeniy Firsov Date: Thu, 16 Feb 2023 16:45:17 -0800 Subject: [PATCH] fix: fix --- .github/workflows/dev-workflow-test.yaml | 4 ++++ Makefile | 6 ++---- scripts/install_go.sh | 2 ++ test/docker/docker-compose.yml | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-workflow-test.yaml b/.github/workflows/dev-workflow-test.yaml index 222be4915..ba966ffd1 100644 --- a/.github/workflows/dev-workflow-test.yaml +++ b/.github/workflows/dev-workflow-test.yaml @@ -11,6 +11,10 @@ on: paths: - scripts/install_*.sh - Makefile + - docker/Dockerfile + - docker/Dockerfile.* + - test/docker/docker-compose.yml + - test/docker/Dockerfile jobs: linux: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index ec17ec73d..c8988b42a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ V=v1 GEN_DIR=${API_DIR}/server/${V} PROTO_DIR=${API_DIR}/proto/server/${V} DATA_PROTO_DIR=internal -LINT_TIMEOUT=5m +LINT_TIMEOUT=15m # Needed to be able to build amd64 binaries on MacOS M1 DOCKER_DIR=test/docker @@ -97,6 +97,7 @@ ${DATA_PROTO_DIR}/%.pb.go: ${DATA_PROTO_DIR}/%.proto coverdir: mkdir -p /tmp/tigris_coverdata && chmod a+w /tmp/tigris_coverdata; rm -f /tmp/tigris_coverdata/* + ls -la /tmp/tigris_coverdata generate: ${GEN_DIR}/api.pb.go ${GEN_DIR}/api.pb.gw.go ${GEN_DIR}/health.pb.go ${GEN_DIR}/health.pb.gw.go ${GEN_DIR}/admin.pb.go ${GEN_DIR}/admin.pb.gw.go ${DATA_PROTO_DIR}/data.pb.go @@ -121,6 +122,3 @@ dump_integration_coverage: sleep 5 /usr/local/go/bin/go tool covdata textfmt -i=/tmp/tigris_coverdata/ -o coverage1.out -deps: - /bin/bash scripts/install_build_deps.sh - /bin/bash scripts/install_test_deps.sh diff --git a/scripts/install_go.sh b/scripts/install_go.sh index 4f1abc7a6..9e0e83cea 100644 --- a/scripts/install_go.sh +++ b/scripts/install_go.sh @@ -74,6 +74,8 @@ case "${OS}-${ARCH}" in ;; esac +echo "$SHA $FN" | shasum -a 256 -c + curl -LO "https://go.dev/dl/go${VERSION}.${V}" if [[ "$OS" == "MINGW"* ]]; then diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml index bcc9fd58c..8022a7ca3 100644 --- a/test/docker/docker-compose.yml +++ b/test/docker/docker-compose.yml @@ -72,6 +72,8 @@ services: - type: bind source: /tmp/tigris_coverdata target: /tmp/tigris_coverdata + bind: + create_host_path: true ports: - "8081:8081" command: >