reset

Makefile

@@ -30,11 +30,6 @@ build-kadabra:
 
 build: build-abra build-kadabra
 
-build-docker-abra:
-	docker run -it -v $(PWD):/abra golang:1.21 bash -c 'cd /abra; ./build-docker-inside.sh'
-
-build-docker: build-docker-abra
-
 clean:
 	@rm '$(GOPATH)/bin/abra'
 	@rm '$(GOPATH)/bin/kadabra'

build-docker-inside.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-if [ ! -f .envrc ]; then
-    . .envrc.sample
-else
-    . .envrc
-fi
-git config --global --add safe.directory /abra  # work around funky file permissions
-
-# fixme for some reason we need to do this
-go get coopcloud.tech/abra/pkg/upstream/commandconn
-go get github.com/sirupsen/logrus@v1.9.3
-go get github.com/cloudflare/circl/dh/x25519@v1.3.3
-go get github.com/mattn/go-runewidth@v0.0.14
-go get github.com/mattn/go-colorable@v0.1.12
-go get coopcloud.tech/abra/pkg/config
-#
-
-make build

go.mod

@@ -104,7 +104,7 @@ require (
 	github.com/fvbommel/sortorder v1.0.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.4
+	github.com/hashicorp/go-retryablehttp v0.7.5
 	github.com/klauspost/pgzip v1.2.6
 	github.com/moby/patternmatcher v0.5.0 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect

tests/integration/helpers/common.bash

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 _common_setup() {
-  load '/usr/lib/bats/bats-support/load'
-  load '/usr/lib/bats/bats-assert/load'
-  load '/usr/lib/bats/bats-file/load'
+  bats_load_library bats-support
+  bats_load_library bats-assert
+  bats_load_library bats-file
 
   load "$PWD/tests/integration/helpers/app"
   load "$PWD/tests/integration/helpers/git"

tests/integration/helpers/server.bash

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 _add_server() {
-  run $ABRA server add "$TEST_SERVER"
+  if [[ "$TEST_SERVER" == "default" ]]; then
+      run $ABRA server add -l
+  else
+      run $ABRA server add "$TEST_SERVER"
+  fi
   assert_success
   assert_exists "$ABRA_DIR/servers/$TEST_SERVER"
 }