Skip to content

Commit

Permalink
fix: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
efirs committed Feb 17, 2023
1 parent ea6ce99 commit 31eb467
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/dev-workflow-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
2 changes: 2 additions & 0 deletions scripts/install_go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ services:
- type: bind
source: /tmp/tigris_coverdata
target: /tmp/tigris_coverdata
bind:
create_host_path: true
ports:
- "8081:8081"
command: >
Expand Down

0 comments on commit 31eb467

Please sign in to comment.