Skip to content

Commit 5699ccb

Browse files
LucaRickliLucaRickli
authored
refactor: move 3rd party code to packages (#142)
* refactor: move 3rd party code to packages
1 parent 3e031e7 commit 5699ccb

39 files changed

+376
-103
lines changed

‎.github/workflows/check-pr.yaml‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,20 @@ jobs:
4646
sudo apt update
4747
sudo apt install -y binaryen
4848
49-
- name: Run Golang check
50-
run: go vet ./wasm/wasm.go
51-
5249
- name: Build Golang WASM
53-
run: go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-test-${{ github.sha }} -s -w" -o ./src/lib/api/tsconnect/pkg/client.wasm ./wasm/wasm.go
50+
run: go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-check-${{ github.sha }} -s -w" -o ./package/tailscale/pkg/tailscale.wasm ./package/tailscale/tailscale.go
5451

5552
- name: Optimize Golang WASM
56-
run: wasm-opt --enable-bulk-memory -Oz ./src/lib/api/tsconnect/pkg/client.wasm -o ./src/lib/api/tsconnect/pkg/client.wasm
53+
run: wasm-opt --enable-bulk-memory -Oz ./package/tailscale/pkg/tailscale.wasm -o ./package/tailscale/pkg/tailscale.wasm
5754

5855
- name: Copy WASM exec.js
59-
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./src/lib/api/tsconnect/pkg/wasm_exec.js
56+
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./package/tailscale/pkg/wasm_exec.js
6057

6158
- name: Upload golang package
6259
uses: actions/upload-artifact@v6
6360
with:
6461
name: golang-wasm-pkg
65-
path: src/lib/api/tsconnect/pkg/
62+
path: package/tailscale/pkg/
6663

6764
rust-wasm:
6865
runs-on: ubuntu-latest
@@ -82,14 +79,14 @@ jobs:
8279
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
8380

8481
- name: Build Rust WASM
85-
working-directory: wasm
82+
working-directory: package/ironRdp
8683
run: wasm-pack build --out-name ironrdp --target web
8784

8885
- name: Upload rust wasm package
8986
uses: actions/upload-artifact@v6
9087
with:
9188
name: rust-wasm-pkg
92-
path: wasm/pkg/
89+
path: package/ironRdp/pkg/
9390

9491
typescript:
9592
needs:
@@ -107,13 +104,13 @@ jobs:
107104
uses: actions/download-artifact@v7
108105
with:
109106
name: golang-wasm-pkg
110-
path: src/lib/api/tsconnect/pkg/
107+
path: package/tailscale/pkg/
111108

112109
- name: Download rust wasm package
113110
uses: actions/download-artifact@v7
114111
with:
115112
name: rust-wasm-pkg
116-
path: wasm/pkg/
113+
path: package/ironRdp/pkg/
117114

118115
- name: Setup Deno
119116
uses: denoland/setup-deno@v2
@@ -123,13 +120,29 @@ jobs:
123120
- name: Install dependencies
124121
run: deno install
125122

126-
# Basic syntax & types check
123+
- name: Patch version
124+
run: deno --allow-read="package.json" --allow-write="package.json" patch-version.js 0.0.0-check-${{ github.sha }}
125+
127126
- name: Run checks
128127
run: deno task check
129128

130129
# TODO: proper tests
130+
131131
# - name: Run unit tests
132132
# run: deno task test:unit
133133

134134
# - name: Run e2e tests
135135
# run: deno task test:e2e
136+
137+
- name: Build frontend
138+
run: deno task build
139+
140+
- name: Removing unnecessary files
141+
run: |
142+
rm dist/frontend.go
143+
144+
- name: Upload app package
145+
uses: actions/upload-artifact@v6
146+
with:
147+
name: app-pkg
148+
path: dist/

‎.github/workflows/release.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
sudo apt install -y binaryen
2727
2828
- name: Build Golang WASM
29-
run: GOOS=js GOARCH=wasm go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-${{ github.event.release.tag_name }} -s -w" -o ./src/lib/api/tsconnect/pkg/client.wasm ./wasm/wasm.go
29+
run: GOOS=js GOARCH=wasm go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-${{ github.event.release.tag_name }} -s -w" -o ./package/tailscale/pkg/tailscale.wasm ./package/tailscale/tailscale.go
3030

3131
- name: Optimize Golang WASM
32-
run: wasm-opt --enable-bulk-memory -Oz ./src/lib/api/tsconnect/pkg/client.wasm -o ./src/lib/api/tsconnect/pkg/client.wasm
32+
run: wasm-opt --enable-bulk-memory -Oz ./package/tailscale/pkg/tailscale.wasm -o ./package/tailscale/pkg/tailscale.wasm
3333

3434
- name: Copy Golang WASM exec.js
35-
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./src/lib/api/tsconnect/pkg/wasm_exec.js
35+
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./package/tailscale/pkg/wasm_exec.js
3636

3737
- name: Upload golang package
3838
uses: actions/upload-artifact@v6
3939
with:
4040
name: golang-wasm-pkg
41-
path: src/lib/api/tsconnect/pkg/
41+
path: package/tailscale/pkg/
4242

4343
build-rust:
4444
runs-on: ubuntu-latest
@@ -58,14 +58,14 @@ jobs:
5858
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
5959

6060
- name: Build Rust WASM
61-
working-directory: wasm
61+
working-directory: package/ironRdp
6262
run: wasm-pack build --out-name ironrdp --target web
6363

6464
- name: Upload rust wasm package
6565
uses: actions/upload-artifact@v6
6666
with:
6767
name: rust-wasm-pkg
68-
path: wasm/pkg/
68+
path: package/ironRdp/pkg/
6969

7070
build:
7171
needs:
@@ -83,13 +83,13 @@ jobs:
8383
uses: actions/download-artifact@v7
8484
with:
8585
name: golang-wasm-pkg
86-
path: src/lib/api/tsconnect/pkg/
86+
path: package/tailscale/pkg/
8787

8888
- name: Download rust wasm package
8989
uses: actions/download-artifact@v7
9090
with:
9191
name: rust-wasm-pkg
92-
path: wasm/pkg/
92+
path: package/ironRdp/pkg/
9393

9494
- name: Setup deno
9595
uses: denoland/setup-deno@v2

‎.github/workflows/unstable.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
sudo apt install -y binaryen
2727
2828
- name: Build Golang WASM
29-
run: GOOS=js GOARCH=wasm go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-unstable-${{ github.sha }} -s -w" -o ./src/lib/api/tsconnect/pkg/client.wasm ./wasm/wasm.go
29+
run: GOOS=js GOARCH=wasm go build -trimpath -ldflags "-X tailscale.com/version.shortStamp=1.82.5 -X tailscale.com/version.longStamp=1.82.5-HeadscaleConsole-unstable-${{ github.sha }} -s -w" -o ./package/tailscale/pkg/tailscale.wasm ./package/tailscale/tailscale.go
3030

3131
- name: Optimize Golang WASM
32-
run: wasm-opt --enable-bulk-memory -Oz ./src/lib/api/tsconnect/pkg/client.wasm -o ./src/lib/api/tsconnect/pkg/client.wasm
32+
run: wasm-opt --enable-bulk-memory -Oz ./package/tailscale/pkg/tailscale.wasm -o ./package/tailscale/pkg/tailscale.wasm
3333

3434
- name: Copy Golang WASM exec.js
35-
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./src/lib/api/tsconnect/pkg/wasm_exec.js
35+
run: cp "$(go env GOROOT)/lib/wasm/wasm_exec.js" ./package/tailscale/pkg/wasm_exec.js
3636

3737
- name: Upload golang package
3838
uses: actions/upload-artifact@v6
3939
with:
4040
name: golang-wasm-pkg
41-
path: src/lib/api/tsconnect/pkg/
41+
path: package/tailscale/pkg/
4242

4343
build-rust:
4444
runs-on: ubuntu-latest
@@ -58,14 +58,14 @@ jobs:
5858
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
5959

6060
- name: Build Rust WASM
61-
working-directory: wasm
61+
working-directory: package/ironRdp
6262
run: wasm-pack build --out-name ironrdp --target web
6363

6464
- name: Upload rust wasm package
6565
uses: actions/upload-artifact@v6
6666
with:
6767
name: rust-wasm-pkg
68-
path: wasm/pkg/
68+
path: package/ironRdp/pkg/
6969

7070
build:
7171
needs:
@@ -83,13 +83,13 @@ jobs:
8383
uses: actions/download-artifact@v7
8484
with:
8585
name: golang-wasm-pkg
86-
path: src/lib/api/tsconnect/pkg/
86+
path: package/tailscale/pkg/
8787

8888
- name: Download rust wasm package
8989
uses: actions/download-artifact@v7
9090
with:
9191
name: rust-wasm-pkg
92-
path: wasm/pkg/
92+
path: package/ironRdp/pkg/
9393

9494
- name: Setup deno
9595
uses: denoland/setup-deno@v2

wasm/.gitignore renamed to package/ironRdp/.gitignore

File renamed without changes.

wasm/Cargo.lock renamed to package/ironRdp/Cargo.lock

File renamed without changes.

wasm/Cargo.toml renamed to package/ironRdp/Cargo.toml

File renamed without changes.

0 commit comments

Comments
 (0)