Skip to content

Commit

Permalink
Move go code back to root
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasIO committed Mar 6, 2024
1 parent b867900 commit 8dbe9bd
Show file tree
Hide file tree
Showing 154 changed files with 18 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{ "repo": "livekit/protocol" }
],
"commit": false,
"fixed": [],
"fixed": [["github.com/livekit/protocol", "@livekit/protocol"]],
"linked": [],
"access": "public",
"baseBranch": "main",
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/buildtest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
- name: Set up gotestfmt
run: go install github.com/gotesttools/gotestfmt/v2/cmd/[email protected]
working-directory: ./packages/golang

- name: Download Go modules
run: go mod download
Expand All @@ -54,10 +53,8 @@ jobs:
with:
checks: '["all", "-ST1000", "-ST1003", "-ST1020", "-ST1021", "-ST1022", "-SA1019"]'
install-go: false
working-directory: ./packages/golang

- name: Test
run: |
set -euo pipefail
MallocNanoZone=0 go test -race -json -v ./... 2>&1 | gotestfmt
working-directory: ./packages/golang
13 changes: 6 additions & 7 deletions .github/workflows/generate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: ">=1.20"
cache-dependency-path: |
packages/golang/go.sum

- name: Go mod tidy
run: go mod tidy
Expand All @@ -49,29 +47,30 @@ jobs:

- name: Bootstrap
run: mage bootstrap
working-directory: ./packages/golang

- name: Generate Protobuf
run: mage proto
working-directory: ./packages/golang

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"

- name: Install dependencies
- name: Install JS dependencies
run: pnpm install
- name: Generate JS files

- name: Test generate JS files
run: |
pnpm --filter @livekit/protocol run generate:proto
- name: Add changes
uses: EndBug/add-and-commit@v9
with:
add: '["packages"]'
add: '["livekit", "rpc", "infra"]'
default_author: github_actions
message: generated protobuf
60 changes: 0 additions & 60 deletions .github/workflows/release-js.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 8

- name: Use Node.js 20
uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"

- name: Install dependencies
run: pnpm install

- name: Create Release Pull Request or Publish packages
id: changesets
uses: changesets/action@v1
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 0 additions & 3 deletions go.work

This file was deleted.

1 change: 0 additions & 1 deletion go.work.sum

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions packages/golang/magefile.go → magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func Proto() error {
"--twirp_opt=paths=source_relative",
"--plugin=go=" + protocGoPath,
"--plugin=twirp=" + twirpPath,
"-I=../../protobufs",
"-I=./protobufs",
}, twirpProtoFiles...)
cmd := exec.Command(protoc, args...)
connectStd(cmd)
Expand All @@ -116,7 +116,7 @@ func Proto() error {
"--go-grpc_opt=paths=source_relative",
"--plugin=go=" + protocGoPath,
"--plugin=go-grpc=" + protocGrpcGoPath,
"-I=../../protobufs",
"-I=./protobufs",
}, grpcProtoFiles...)
cmd = exec.Command(protoc, args...)
connectStd(cmd)
Expand All @@ -131,7 +131,7 @@ func Proto() error {
"--go-grpc_opt=paths=source_relative",
"--plugin=go=" + protocGoPath,
"--plugin=go-grpc=" + protocGrpcGoPath,
"-I=../../protobufs",
"-I=./protobufs",
}, infraProtoFiles...)
cmd = exec.Command(protoc, args...)
connectStd(cmd)
Expand Down Expand Up @@ -161,7 +161,7 @@ func Proto() error {
"--plugin=go=" + protocGoPath,
"--plugin=psrpc=" + psrpcPath,
"-I" + psrpcDir + "/protoc-gen-psrpc/options",
"-I=../../protobufs",
"-I=./protobufs",
}, psrpcProtoFiles...)
cmd = exec.Command(protoc, args...)
mageutil.ConnectStd(cmd)
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "github.com/livekit/protocol",
"private": true,
"version": "0.0.1",
"version": "1.10.1",
"scripts": {
"version": "changeset version",
"publish:ci": "pnpm --filter @livekit/protocol run build && changeset publish --dry-run"
Expand Down
5 changes: 0 additions & 5 deletions packages/golang/package.json

This file was deleted.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
packages:
- "packages/javascript"
- "./"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 8dbe9bd

Please sign in to comment.