Skip to content

Commit

Permalink
remove tinygo
Browse files Browse the repository at this point in the history
  • Loading branch information
acouvreur committed Feb 15, 2025
1 parent aa2521a commit 56950c8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 22 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup TinyGo
uses: acifani/setup-tinygo@v2
- name: Set up Go 1.24
uses: actions/setup-go@v5
with:
tinygo-version: '0.33.0'
go-version: 1.24
cache-dependency-path: |
plugins/proxywasm/go.sum
- name: Build
run: make proxywasm
Expand All @@ -249,10 +251,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go 1.22
- name: Set up Go 1.24
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.24
cache-dependency-path: |
go.sum
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,15 @@ jobs:
fetch-depth: 0
persist-credentials: false

- name: Set up Go 1.22
- name: Set up Go 1.24
uses: actions/setup-go@v5
with:
go-version: ^1.22
go-version: ^1.24

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'

- name: Setup TinyGo
uses: acifani/setup-tinygo@v2
with:
tinygo-version: '0.33.0'

- name: Release
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ release: $(PLATFORMS)

proxywasm:
go generate ./plugins/proxywasm
tinygo build -ldflags "-X 'main.Version=$(VERSION)'" -o ./plugins/proxywasm/sablierproxywasm.wasm -scheduler=none -target=wasi ./plugins/proxywasm
GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o ./plugins/proxywasm/sablierproxywasm.wasm ./plugins/proxywasm
cp ./plugins/proxywasm/sablierproxywasm.wasm ./sablierproxywasm_$(VERSION).wasm

.PHONY: release $(PLATFORMS)
Expand Down
5 changes: 1 addition & 4 deletions plugins/proxywasm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
FROM golang:1.24 AS build

ADD https://github.com/tinygo-org/tinygo/releases/download/v0.33.0/tinygo_0.33.0_amd64.deb tinygo_amd64.deb
RUN dpkg -i tinygo_amd64.deb

WORKDIR /go/src/sablier/plugins/proxywasm

COPY go.mod ./
Expand All @@ -11,7 +8,7 @@ RUN go mod download

COPY . /go/src/sablier/plugins/proxywasm

RUN make
RUN make build

FROM scratch

Expand Down
6 changes: 1 addition & 5 deletions plugins/proxywasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@

See more at
- https://github.com/proxy-wasm/spec
- https://github.com/tetratelabs/proxy-wasm-go-sdk

## Prerequisite

- Install TinyGo: https://tinygo.org/getting-started/install/
- https://github.com/proxy-wasm/proxy-wasm-go-sdk

0 comments on commit 56950c8

Please sign in to comment.