Merge main

Author: Jagger De Leo

.github/workflows/ci.yml

@@ -202,10 +202,6 @@ jobs:
       - name: Run subo build
         run: subo build ${{ matrix.language }}-test --builder-tag dev
 
-      - name: Check TinyGo version number consistency
-        if: matrix.language == 'tinygo'
-        run: builder/docker/tinygo/smoke.sh
-
   release-image-subo:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: [image, lint, test, smoke]

.github/workflows/tinygo-base.yml

@@ -1,6 +1,5 @@
 # all paths are relative to project root
 ver = $(shell cat ./builder/.image-ver)
-tinygo_ver = $(shell cat ./builder/docker/tinygo/.tinygo-ver)
 
 builder/docker: subo/docker builder/docker/rust builder/docker/swift builder/docker/as builder/docker/tinygo builder/docker/grain builder/docker/javascript builder/docker/wat
 
@@ -38,16 +37,6 @@ builder/docker/swift/publish:
 builder/docker/swift/dev/publish:
 	docker buildx build . -f builder/docker/swift/Dockerfile --platform linux/amd64,linux/arm64 -t suborbital/builder-swift:dev --push
 
-# TinyGo (base) docker targets
-builder/docker/tinygo-base:
-	DOCKER_BUILDKIT=1 docker build . -f builder/docker/tinygo/Dockerfile.base -t suborbital/tinygo-base:$(tinygo_ver)
-
-builder/docker/tinygo-base/publish:
-	docker buildx build . -f builder/docker/tinygo/Dockerfile.base --platform linux/amd64,linux/arm64 -t suborbital/tinygo-base:$(tinygo_ver) --push
-
-builder/docker/tinygo-base/dev/publish:
-	docker buildx build . -f builder/docker/tinygo/Dockerfile.base --platform linux/amd64,linux/arm64 -t suborbital/tinygo-base:dev --push
-
 # TinyGo docker targets
 builder/docker/tinygo:
 	DOCKER_BUILDKIT=1 docker build . -f builder/docker/tinygo/Dockerfile -t suborbital/builder-tinygo:$(ver)

builder/builder.mk

@@ -1,10 +1,29 @@
-FROM suborbital/tinygo-base:v0.23.0 as tinygo
 FROM suborbital/subo:dev as subo
+FROM golang:1.18-bullseye as go
+
+FROM debian:bullseye-slim
+RUN apt-get update && apt-get -y install wget
+
+WORKDIR /usr/local
+
+# update TinyGo version here!
+ARG TINYGO_VERSION=0.24.0
+ARG TARGETARCH
+
+RUN wget -O tinygo.tar.gz \
+    "https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo${TINYGO_VERSION}.linux-${TARGETARCH}.tar.gz" && \
+    tar xf tinygo.tar.gz && \
+    bash -c "rm -rf tinygo/src/device/{sam,stm32,nxp,nrf,avr,esp,rp}" && \
+    bash -c "rm -rf tinygo/lib/{nrfx,mingw-w64,macos-minimal-sdk}" && \
+    rm -rf tinygo/src/examples && \
+    rm -rf tinygo.tar.gz 
 
-FROM golang:1.18-bullseye
 WORKDIR /root/runnable
-COPY --from=tinygo /root/release/tinygo /usr/local/tinygo
+
+COPY --from=go /usr/local/go /usr/local/
 COPY --from=subo /go/bin/subo /usr/local/bin
-RUN ln -s /usr/local/tinygo/bin/tinygo /usr/local/bin/tinygo && \
-    ln -s /usr/local/tinygo/bin/wasm-opt /usr/local/bin/wasm-opt
-RUN go mod download github.com/suborbital/reactr@latest
+
+ENV PATH="/usr/local/tinygo/bin:/usr/local/go/bin:$PATH"
+
+RUN go mod download github.com/suborbital/reactr@latest && \
+    rm -rf /go/pkg/mod/github.com/suborbital/reactr*/rwasm/testdata

builder/docker/tinygo/.tinygo-ver

@@ -34,7 +34,7 @@ func (r *Repl) Run() error {
 	}
 
 	for {
-		fmt.Println("\n\n1. Create or edit a function")
+		fmt.Println("\n\n1. Create/edit a function")
 		fmt.Print("\nChoose an option: ")
 
 		opt, err := input.ReadStdinString()

builder/docker/tinygo/Dockerfile

@@ -54,7 +54,7 @@ Flags:
 ```
 
 ## Building Wasm Runnables
-**It is reccomended that Docker be installed to build Wasm Runnables. See below if you do not have Docker installed.**
+**It is recommended that Docker be installed to build Wasm Runnables. See below if you do not have Docker installed.**
 
 To build your Runnable into a Wasm module for Reactr or Atmo, use the build command:
 ```

builder/docker/tinygo/Dockerfile.base

@@ -5,11 +5,11 @@ go 1.18
 require (
 	github.com/deislabs/go-bindle v0.1.1-0.20220201013943-612c59d27f42
 	github.com/google/go-github/v41 v41.0.0
-	github.com/hashicorp/go-version v1.5.0
+	github.com/hashicorp/go-version v1.6.0
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.4.0
-	github.com/stretchr/testify v1.7.4
+	github.com/spf13/cobra v1.5.0
+	github.com/stretchr/testify v1.8.0
 	github.com/suborbital/atmo v0.4.7
 	golang.org/x/mod v0.5.1
 	gopkg.in/yaml.v2 v2.4.0