Missing changes from last PR

.github/workflows/builder.yml

@@ -13,7 +13,6 @@ on:
 name: Building Package
 jobs:
   build:
-    environment: builder
     runs-on: ubuntu-latest
     steps:
       - name: Register

infra/builder-worker/src/builder-worker.ts

@@ -72,7 +72,7 @@ export class BuilderWorker {
           owner: "maxmcd",
           repo: "bramble",
           workflow_id: ".github/workflows/builder.yml",
-          ref: "infra-2",
+          ref: "main",
           inputs: { ...body, JobID: id },
         },
       );

internal/command/cli.go

@@ -391,7 +391,6 @@ their public functions with documentation. If an immediate subdirectory has a
 								drvs = append(drvs, drv)
 							}
 							// TODO: replace with something generally usable
-							fmt.Println(len(os.Getenv("DIGITALOCEAN_SPACES_ACCESS_ID")), len(os.Getenv("DIGITALOCEAN_SPACES_SECRET_KEY")))
 							s3 := simples3.New("",
 								os.Getenv("DIGITALOCEAN_SPACES_ACCESS_ID"),
 								os.Getenv("DIGITALOCEAN_SPACES_SECRET_KEY"))

internal/command/integration_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
@@ -133,37 +132,37 @@ func TestRun(t *testing.T) {
 	}
 }
 
-func TestDep_handler(t *testing.T) {
-	initIntegrationTest(t)
-	app := cliApp(".")
-	ctx, cancel := context.WithCancel(context.Background())
-	errChan := make(chan error)
-	test.SetEnv(t, "BRAMBLE_PATH", t.TempDir())
-	go func() {
-		if err := app.RunContext(ctx, []string{"bramble", "server"}); err != nil {
-			errChan <- err
-		}
-	}()
-	t.Cleanup(func() { cancel() })
-	for {
-		resp, _ := http.Get("http://localhost:2726")
-		if resp != nil {
-			resp.Body.Close()
-		}
-		if resp != nil && resp.StatusCode == http.StatusNotFound {
-			break
-		}
-		select {
-		case err := <-errChan:
-			t.Fatal(err)
-		default:
-		}
-	}
-	// TODO: this actually pulls from github, no network access in tests
-	if err := app.RunContext(ctx, []string{"bramble", "publish", "github.com/maxmcd/busybox"}); err != nil {
-		t.Fatal(err)
-	}
-}
+// TODO: don't hit the real build server
+// func TestDep_handler(t *testing.T) {
+// 	initIntegrationTest(t)
+// 	app := cliApp(".")
+// 	ctx, cancel := context.WithCancel(context.Background())
+// 	errChan := make(chan error)
+// 	test.SetEnv(t, "BRAMBLE_PATH", t.TempDir())
+// 	go func() {
+// 		if err := app.RunContext(ctx, []string{"bramble", "server"}); err != nil {
+// 			errChan <- err
+// 		}
+// 	}()
+// 	t.Cleanup(func() { cancel() })
+// 	for {
+// 		resp, _ := http.Get("http://localhost:2726")
+// 		if resp != nil {
+// 			resp.Body.Close()
+// 		}
+// 		if resp != nil && resp.StatusCode == http.StatusNotFound {
+// 			break
+// 		}
+// 		select {
+// 		case err := <-errChan:
+// 			t.Fatal(err)
+// 		default:
+// 		}
+// 	}
+// 	if err := app.RunContext(ctx, []string{"bramble", "publish", "github.com/maxmcd/busybox"}); err != nil {
+// 		t.Fatal(err)
+// 	}
+// }
 
 func TestBuildAllFunction(t *testing.T) {
 	initIntegrationTest(t)

internal/dependency/dependency.go

@@ -172,19 +172,13 @@ func PostJob(ctx context.Context, url, pkg, reference string) (err error) {
 		return err
 	}
 	dur := (time.Millisecond * 1000)
-	count := 0
 	fmt.Println("Waiting for build result...")
 	for {
 		select {
 		case <-ctx.Done():
 			return context.Canceled
 		default:
 		}
-		if count > 5 {
-			// Many jobs finish quickly, but if they don't, we can check less
-			// often
-			dur = time.Second
-		}
 		job, err := dc.getJob(context.Background(), id)
 		if err != nil {
 			return err
@@ -197,7 +191,6 @@ func PostJob(ctx context.Context, url, pkg, reference string) (err error) {
 			fmt.Printf("Build complete in %s\n", job.End.Sub(job.Start))
 			break
 		}
-		count++
 		time.Sleep(dur)
 	}
 	return nil