update dev loop

widmogrod · Mar 31, 2024 · 8e6a8c8 · 8e6a8c8
1 parent a7c9c86
commit 8e6a8c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,26 +12,15 @@ jobs:
           go-version: ^1.21
         id: go
 
-      - name: Add $GOPATH/bin to $PATH
-        run: |
-          echo "${{ env.GOPATH }}/bin" >> $GITHUB_PATH
-          echo $GITHUB_PATH
-          echo "asd"
-          echo $(go env GOPATH)/bin
-
       - run: cd cmd/mkunion; go get -v -t -d ./...
       - run: cd cmd/mkunion; go build -o mkunion
 
-      - run: | 
-          go install github.com/matryer/moq@latest
-          which moq
+      - run: go install github.com/matryer/moq@latest
 
       - run: go get -v -t -d ./...
       - run: go generate ./...
 
-      # initiate docker-compose services
-      - run: |
-          pip install awscli-local
+      - run: pip install awscli-local
       - run: dev/bootstrap.sh -nologs
 
       # run tests

diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh
@@ -12,11 +12,17 @@ command -v docker-compose >/dev/null 2>&1 || { echo >&2 "docker-compose is not i
 command -v awslocal >/dev/null 2>&1 || { echo >&2 "awslocal is not installed. Aborting. Please run
   pip install awscli-local  "; exit 1; }
 
+# check for moq
+command -v moq >/dev/null 2>&1 || { echo >&2 "moq is not installed. Aborting please run
+   go install github.com/matryer/moq@latest"; exit 1; }
+
 echo "Creating volume directory"
 mkdir -p $cwd/_volume
 
-echo "Install moq"
-go get github.com/matryer/moq@latest
+if [ "$1" == "-install-only" ]; then
+  trap - EXIT
+  exit 0
+fi
 
 echo "Starting localstack"
 docker compose -f $cwd/compose.yml up -d