Skip to content

Commit

Permalink
chore: merge remote-tracking branch 'upstream/main' into fix/inline-d…
Browse files Browse the repository at this point in the history
…atabase-view
  • Loading branch information
richardshiue committed Jan 29, 2024
2 parents cd07ab1 + 3eef93f commit 6ae5257
Show file tree
Hide file tree
Showing 97 changed files with 2,659 additions and 1,592 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN: "1.70"
RUST_TOOLCHAIN: "1.75"

jobs:
fmt:
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/wasm_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Collab-WASM

on:
push:
branches: [ main ]
pull_request:
types: [ opened, synchronize, reopened ]
branches: [ main ]

env:
RUST_TOOLCHAIN: "1.75"
CARGO_MAKE_VERSION: "0.36.6"

jobs:
wasm_build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable

- name: Install wasm-pack
run: cargo install wasm-pack

- uses: taiki-e/install-action@v2
with:
tool: cargo-make@${{ env.CARGO_MAKE_VERSION }}

- name: Build
run: cargo make wasm_build

41 changes: 41 additions & 0 deletions .github/workflows/wasm_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Wasm Tests

on:
pull_request:

env:
RUST_TOOLCHAIN: "1.75"
CARGO_MAKE_VERSION: "0.36.6"

jobs:
test:
name: Run Wasm Tests
runs-on: ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v2

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- name: Install wasm-pack
uses: jetli/[email protected]
with:
version: latest

- uses: taiki-e/install-action@v2
with:
tool: cargo-make@${{ env.CARGO_MAKE_VERSION }}

- name: Install Node.js
uses: actions/setup-node@v2
with:
node-version: '14'

- name: Run Wasm Tests
run: cargo make wasm_test
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
.idea

**/temp/**
**/collab-plugins/.env
**/collab-plugins/.env.test
collab-plugins/.env
collab-plugins/.env.test
**/unit_test**
Loading

0 comments on commit 6ae5257

Please sign in to comment.