Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(): json-over-bebop #267

Merged
merged 5 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION="2.7.4"
VERSION="2.8.0"
MAJOR=2
MINOR=7
PATCH=4
MINOR=8
PATCH=0
9 changes: 5 additions & 4 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ jobs:
sudo apt install gcc g++
- name: Build Typescript runtime
run: |
npm install
npm run build
yarn install
yarn test
yarn build
working-directory: ./Runtime/TypeScript
- name: npm install
run: npm install
- name: yarn install
run: yarn install
working-directory: ${{env.TEST_ROOT}}
- name: Test
run: node run_test.js
Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,29 +205,30 @@ jobs:

- name: Build Typescript runtime
run: |
npm install
npm run build
yarn install
yarn test
yarn build
working-directory: ${{env.TS_RUNTIME_ROOT}}

- name: Test TypeScript Runtime
run: |
npm install
yarn install
bash compile-schemas.sh
npm run test
yarn test
working-directory: ${{env.TS_TEST_ROOT}}

- name: Pack TypeScript Runtime
run: |
jq '.version = "${{ steps.dotenv.outputs.version }}"' package.json > tmp && mv tmp package.json
npm install
npm pack
yarn install
yarn pack
working-directory: ${{env.TS_RUNTIME_ROOT}}

- name: Upload TypeScript Runtime Package
uses: actions/upload-artifact@v2
with:
name: bebop-runtime-ts-${{ steps.dotenv.outputs.version }}
path: ${{env.TS_RUNTIME_ROOT}}/bebop-${{ steps.dotenv.outputs.version }}.tgz
path: ${{env.TS_RUNTIME_ROOT}}/bebop-v${{ steps.dotenv.outputs.version }}.tgz

- name: Build REPL
run: |
Expand Down Expand Up @@ -305,15 +306,15 @@ jobs:
- name: Build Tools NPM Package
run: |
jq '.version = "${{ steps.dotenv.outputs.version }}"' package.json > tmp && mv tmp package.json
npm install
npm pack
yarn install
yarn pack
working-directory: ${{env.TOOLS_ROOT}}/node

- name: Upload NPM Artifact
uses: actions/upload-artifact@v2
with:
name: bebop-tools-npm-${{ steps.dotenv.outputs.version }}
path: ${{env.TOOLS_ROOT}}/node/bebop-tools-${{ steps.dotenv.outputs.version }}.tgz
path: ${{env.TOOLS_ROOT}}/node/bebop-tools-v${{ steps.dotenv.outputs.version }}.tgz

- name: Copy compiler builds for VSCode extension
run: |
Expand Down Expand Up @@ -388,12 +389,12 @@ jobs:
working-directory: ${{env.RUST_RUNTIME_ROOT}}

- name: Publish NodeJS Tools
run: npm publish "./bebop-tools-npm-${{ steps.dotenv.outputs.version }}/bebop-tools-${{ steps.dotenv.outputs.version }}.tgz" --access public
run: npm publish "./bebop-tools-npm-${{ steps.dotenv.outputs.version }}/bebop-tools-v${{ steps.dotenv.outputs.version }}.tgz" --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

- name: Publish TypeScript Runtime
run: npm publish "./bebop-runtime-ts-${{ steps.dotenv.outputs.version }}/bebop-${{ steps.dotenv.outputs.version }}.tgz" --access public
run: npm publish "./bebop-runtime-ts-${{ steps.dotenv.outputs.version }}/bebop-v${{ steps.dotenv.outputs.version }}.tgz" --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/test-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ jobs:
include-prerelease: true
- name: Build Typescript runtime
run: |
npm install
npm run build
yarn install
yarn test
yarn build
working-directory: ./Runtime/TypeScript
- name: Build and run tests
run: |
npm install
yarn install
bash compile-schemas.sh
npm run test
yarn test
working-directory: ./Laboratory/TypeScript
2 changes: 1 addition & 1 deletion Core/Exceptions/Exceptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public UnexpectedEndOfFile(Span span)
public class EnumZeroWarning : SpanException
{
public EnumZeroWarning(Field field)
: base($"Bebop recommends that 0 in an enum be reserved for a value named 'Unknown', 'Default', or similar. See https://github.com/RainwayApp/bebop/wiki/Why-should-0-be-a-%22boring%22-value-in-an-enum%3F for more info.", field.Span, 200, Severity.Warning)
: base($"Bebop recommends that 0 in an enum be reserved for a value named 'Unknown', 'Default', or similar. See https://github.com/betwixt-labs/bebop/wiki/Why-should-0-be-a-%22boring%22-value-in-an-enum%3F for more info.", field.Span, 200, Severity.Warning)
{ }
}

Expand Down
Loading