Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Stewart <christian@aperture.us>
  • Loading branch information
paralin committed May 16, 2024
1 parent 980b99a commit cae3723
Show file tree
Hide file tree
Showing 14 changed files with 254 additions and 206 deletions.
1 change: 0 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"workarounds:all"
],
"branchConcurrentLimit": 0,
"ignorePaths": ["hack"],
"packageRules": [
{
"matchManagers": ["gomod"],
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '41 13 * * 6'
Expand All @@ -25,7 +26,7 @@ jobs:
matrix:
language: [ 'go', 'javascript' ]
go: ['1.22']
node: [21.x]
node: [22.x]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

Expand All @@ -38,19 +39,30 @@ jobs:
with:
go-version: ${{ matrix.go }}

- name: Cache Go modules
uses: actions/cache/restore@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Setup Node.JS ${{ matrix.node }}
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node }}
cache: 'yarn'

- name: Initialize CodeQL
uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
with:
languages: ${{ matrix.language }}


- name: Autobuild
uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
49 changes: 39 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,66 @@ permissions:
contents: read

jobs:
integration:
tests:
runs-on: ubuntu-latest
strategy:
matrix:
go: ['1.22']
node: [21.x]
node: [22.x]
timeout-minutes: 10
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- name: Setup Go ${{ matrix.go }}
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: ${{ matrix.go }}

- name: Cache Go modules
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
- name: Setup Node.JS ${{ matrix.node }}
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node }}
cache: 'yarn'

- name: Yarn install
run: yarn install
# - name: Depcheck
# run: yarn run deps

- name: Cache tools
uses: actions/cache@v4
with:
path: |
./hack/bin
key: ${{ runner.os }}-aptre-tools-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-aptre-tools-
- name: Build Javascript
run: yarn run build
- name: Lint Javascript
run: yarn run lint:js

- name: Test Go
run: make test

- name: Test Js
run: yarn test:js

- name: Lint Js
run: yarn run lint:js

- name: Lint Go
run: yarn run lint:go
- name: Test Go
run: make test
- name: Test integration of Go and TypeScript
run: yarn integration

- name: Test integration
run: yarn run integration

- name: Depcheck Js
run: yarn run deps
2 changes: 1 addition & 1 deletion e2e/mock/mock.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 11 additions & 13 deletions e2e/mock/mock.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from "@aptre/protobuf-es-lite";
import { createMessageType, Message, ScalarType } from "@aptre/protobuf-es-lite";
import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'

export const protobufPackage = "e2e.mock";
export const protobufPackage = 'e2e.mock'

/**
* MockMsg is the mock message body.
Expand All @@ -16,16 +16,14 @@ export type MockMsg = Message<{
/**
* @generated from field: string body = 1;
*/
body?: string;

}>;
body?: string
}>

// MockMsg contains the message type declaration for MockMsg.
export const MockMsg: MessageType<MockMsg> = createMessageType({
typeName: "e2e.mock.MockMsg",
fields: [
{ no: 1, name: "body", kind: "scalar", T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
});

typeName: 'e2e.mock.MockMsg',
fields: [
{ no: 1, name: 'body', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
28 changes: 13 additions & 15 deletions e2e/mock/mock_srpc.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
// @generated from file github.com/aperturerobotics/starpc/e2e/mock/mock.proto (package e2e.mock, syntax proto3)
/* eslint-disable */

import { MockMsg } from "./mock.pb.js";
import { Message, MethodKind } from "@aptre/protobuf-es-lite";
import { ProtoRpc } from "starpc";
import { MockMsg } from './mock.pb.js'
import { Message, MethodKind } from '@aptre/protobuf-es-lite'
import { ProtoRpc } from 'starpc'

/**
* Mock service mocks some RPCs for the e2e tests.
*
* @generated from service e2e.mock.Mock
*/
export const MockDefinition = {
typeName: "e2e.mock.Mock",
typeName: 'e2e.mock.Mock',
methods: {
/**
* MockRequest runs a mock unary request.
*
* @generated from rpc e2e.mock.Mock.MockRequest
*/
MockRequest: {
name: "MockRequest",
name: 'MockRequest',
I: MockMsg,
O: MockMsg,
kind: MethodKind.Unary,
},
}
} as const;
},
} as const

/**
* Mock service mocks some RPCs for the e2e tests.
Expand All @@ -40,10 +40,9 @@ export interface Mock {
* @generated from rpc e2e.mock.Mock.MockRequest
*/
MockRequest(
request: Message<MockMsg>, abortSignal?: AbortSignal
):
Promise<Message<MockMsg>>

request: Message<MockMsg>,
abortSignal?: AbortSignal,
): Promise<Message<MockMsg>>
}

export const MockServiceName = MockDefinition.typeName
Expand All @@ -62,9 +61,9 @@ export class MockClient implements Mock {
* @generated from rpc e2e.mock.Mock.MockRequest
*/
async MockRequest(
request: Message<MockMsg>, abortSignal?: AbortSignal
):
Promise<Message<MockMsg>> {
request: Message<MockMsg>,
abortSignal?: AbortSignal,
): Promise<Message<MockMsg>> {
const requestMsg = MockMsg.create(request)
const result = await this.rpc.request(
this.service,
Expand All @@ -74,5 +73,4 @@ Promise<Message<MockMsg>> {
)
return MockMsg.fromBinary(result)
}

}
2 changes: 1 addition & 1 deletion echo/echo.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 11 additions & 13 deletions echo/echo.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
// @generated from file github.com/aperturerobotics/starpc/echo/echo.proto (package echo, syntax proto3)
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from "@aptre/protobuf-es-lite";
import { createMessageType, Message, ScalarType } from "@aptre/protobuf-es-lite";
import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'

export const protobufPackage = "echo";
export const protobufPackage = 'echo'

/**
* EchoMsg is the message body for Echo.
Expand All @@ -16,16 +16,14 @@ export type EchoMsg = Message<{
/**
* @generated from field: string body = 1;
*/
body?: string;

}>;
body?: string
}>

// EchoMsg contains the message type declaration for EchoMsg.
export const EchoMsg: MessageType<EchoMsg> = createMessageType({
typeName: "echo.EchoMsg",
fields: [
{ no: 1, name: "body", kind: "scalar", T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
});

typeName: 'echo.EchoMsg',
fields: [
{ no: 1, name: 'body', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"ws": "^8.17.0"
},
"resolutions": {
"@aptre/protobuf-es-lite": "0.4.3"
"@aptre/protobuf-es-lite": "0.4.4"
}
}
2 changes: 1 addition & 1 deletion rpcstream/rpcstream.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cae3723

Please sign in to comment.