Skip to content

Commit

Permalink
Merge branch 'rc' into sy-1093-additional-schematic-symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
pjdotson committed Sep 16, 2024
2 parents 162ebac + 71340fb commit 48c9e0d
Show file tree
Hide file tree
Showing 133 changed files with 3,552 additions and 2,406 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/deploy.console.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ macos-12, windows-latest ]
platform: [macos-12, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout Repository
Expand Down Expand Up @@ -145,18 +145,17 @@ jobs:
- name: Install Dependencies
run: pnpm i


- name: Build Pluto
if: needs.setup.outputs.changed == 'true'
run: pnpm build:pluto

- name: Build Drift
if: needs.setup.outputs.changed == 'true'
run: pnpm build:drift

# We need to build the console separately WITHOUT turbo repo because of strange
# incompatibility issues with rust builds.

- name: Build Console
if: needs.setup.outputs.changed == 'true'
env:
Expand All @@ -171,21 +170,18 @@ jobs:
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/macos/Synnax.app.tar.gz.sig
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/dmg/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64.dmg
- name: Upload Windows Release Asset
if: github.event_name == 'push' && matrix.platform == 'windows-latest'
run: |
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi.zip
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi.zip.sig
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/msi/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64_en-US.msi.sig
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.exe
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.nsis.zip
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.nsis.zip.sig
gh release upload --clobber console-v${{ needs.setup.outputs.VERSION }} ./console/src-tauri/target/release/bundle/nsis/Synnax_${{ needs.setup.outputs.PURE_VERSION }}_x64-setup.exe.sig
publish-release:
runs-on: ubuntu-latest
if: needs.setup.outputs.changed == 'true' && needs.create-release.outputs.release_id != ''
needs: [ create-release, build-tauri, setup ]
needs: [create-release, build-tauri, setup]
env:
VERSION: ${{ needs.setup.outputs.VERSION }}
PURE_VERSION: ${{ needs.setup.outputs.PURE_VERSION }}
Expand Down Expand Up @@ -233,7 +229,7 @@ jobs:
const darwinURL = baseURL + "Synnax.app.tar.gz";
const darwinSig = await github.request(`GET ${darwinURL}.sig`);
const windowsURL = baseURL + `Synnax_${pureVersion}_x64_en-US.msi.zip`;
const windowsURL = baseURL + `Synnax_${pureVersion}_x64_en-US.msi`;
const windowsSig = await github.request(`GET ${windowsURL}.sig`);
const pub_date = new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
const ecd = new TextDecoder();
Expand Down Expand Up @@ -281,5 +277,3 @@ jobs:
message: "Auto Update JSON File"
pull: "--commit --no-edit"
push: "origin main --force"


2 changes: 1 addition & 1 deletion alamos/py/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "alamos"
version = "0.28.0"
version = "0.29.0"
description = ""
authors = ["Emiliano Bonilla <ebonilla@synnaxlabs.com>"]
readme = "README.md"
Expand Down
10 changes: 5 additions & 5 deletions alamos/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synnaxlabs/alamos",
"version": "0.28.0",
"version": "0.29.0",
"type": "module",
"description": "Distributed instrumentation for Synnax",
"repository": "https://github.com/synnaxlabs/synnax/tree/main/freighter/ts",
Expand Down Expand Up @@ -37,11 +37,11 @@
"devDependencies": {
"@synnaxlabs/tsconfig": "workspace:*",
"@synnaxlabs/vite-plugin": "workspace:*",
"@vitest/coverage-v8": "^1.5.0",
"@vitest/coverage-v8": "^2.1.0",
"eslint-config-synnaxlabs": "workspace:*",
"typescript": "^5.4.5",
"vite": "5.2.11",
"vitest": "^1.5.0"
"typescript": "^5.6.2",
"vite": "5.4.4",
"vitest": "^2.1.0"
},
"main": "dist/index.js",
"module": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion client/py/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "synnax"
version = "0.28.0"
version = "0.29.0"
description = "Synnax Client Library"
keywords = ["Synnax", "Synnax Python Client"]
authors = ["emiliano bonilla <emilbon99@gmail.com>"]
Expand Down
2 changes: 1 addition & 1 deletion client/py/synnax/control/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def wait_until(
"""
return self._internal_wait_until(cond, timeout)

def while_true(
def wait_while(
self,
cond: Callable[[Controller], bool],
timeout: CrudeTimeSpan = None,
Expand Down
4 changes: 2 additions & 2 deletions client/py/tests/test_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def daq(ev: threading.Event):
assert assertions["seq_second_ack"]
assert assertions["remained_true"]

def test_while_true(self, client: sy.Synnax):
def test_wait_while(self, client: sy.Synnax):
"""Test that the controller can wait for a condition to be true for a certain amount of time"""
press_end_cmd_time, press_en_cmd, press_en, daq_time = create_valve_set(client)

Expand Down Expand Up @@ -318,7 +318,7 @@ def is_closed(auto):
c += 1
return not auto[press_en.key]

remained_true = auto.while_true(is_closed)
remained_true = auto.wait_while(is_closed)
assertions["remained_true"] = remained_true
assertions["remained_true_count"] = c

Expand Down
16 changes: 8 additions & 8 deletions client/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synnaxlabs/client",
"version": "0.28.0",
"version": "0.29.0",
"description": "The Synnax Client Library",
"keywords": [
"synnax",
Expand Down Expand Up @@ -42,16 +42,16 @@
"devDependencies": {
"@synnaxlabs/tsconfig": "workspace:*",
"@synnaxlabs/vite-plugin": "workspace:*",
"@types/node": "^22.2.0",
"@vitest/coverage-v8": "^2.0.5",
"eslint": "^9.9.0",
"@types/node": "^22.5.4",
"@vitest/coverage-v8": "^2.1.0",
"eslint": "^9.10.0",
"eslint-config-synnaxlabs": "workspace:*",
"typescript": "^5.5.4",
"vite": "5.4.0",
"vitest": "^2.0.5"
"typescript": "^5.6.2",
"vite": "5.4.4",
"vitest": "^2.1.0"
},
"peerDependencies": {
"zod": "^3.23.8"
"zod": "3.23.8"
},
"type": "module",
"types": "dist/index.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions configs/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"access": "public"
},
"dependencies": {
"typescript": "^5.4.5"
"typescript": "^5.6.2"
},
"devDependencies": {
"@eslint/compat": "^1.0.3",
"@eslint/js": "^9.4.0",
"eslint": "^9.3.0",
"eslint": "^9.10.0",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-simple-import-sort": "^12.1.0",
"globals": "^15.3.0",
Expand Down
2 changes: 1 addition & 1 deletion configs/ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"access": "public"
},
"dependencies": {
"typescript": "^5.4.5"
"typescript": "^5.6.2"
}
}
8 changes: 4 additions & 4 deletions configs/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
},
"dependencies": {
"@synnaxlabs/tsconfig": "workspace:*",
"typescript": "^5.4.5",
"vite": "5.2.11",
"vite-plugin-dts": "3.8.2",
"vite-tsconfig-paths": "4.3.2"
"typescript": "^5.6.2",
"vite": "5.4.4",
"vite-plugin-dts": "4.2.1",
"vite-tsconfig-paths": "5.0.1"
},
"main": "dist/index.js",
"module": "dist/index.js",
Expand Down
46 changes: 23 additions & 23 deletions console/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@synnaxlabs/console",
"private": true,
"version": "0.28.6",
"version": "0.29.1",
"type": "module",
"scripts": {
"dev": "tauri dev",
Expand All @@ -17,43 +17,43 @@
"react-devtools": "npx react-devtools"
},
"dependencies": {
"@fontsource/inter": "^5.0.18",
"@reduxjs/toolkit": "^2.2.6",
"@fontsource/inter": "^5.1.0",
"@reduxjs/toolkit": "^2.2.7",
"@synnaxlabs/client": "workspace:*",
"@synnaxlabs/drift": "workspace:*",
"@synnaxlabs/media": "workspace:*",
"@synnaxlabs/pluto": "workspace:*",
"@synnaxlabs/x": "workspace:*",
"@tanstack/react-query": "^5.49.2",
"@tauri-apps/api": "2.0.0-rc.0",
"@tauri-apps/plugin-deep-link": "2.0.0-rc.0",
"@tauri-apps/plugin-dialog": "2.0.0-rc.0",
"@tauri-apps/plugin-fs": "2.0.0-rc.0",
"@tauri-apps/plugin-process": "2.0.0-rc.0",
"@tauri-apps/plugin-store": "2.0.0-rc.0",
"@tauri-apps/plugin-updater": "2.0.0-rc.0",
"@tanstack/react-query": "^5.56.2",
"@tauri-apps/api": "^2.0.0-rc.4",
"@tauri-apps/plugin-deep-link": "2.0.0-rc.2",
"@tauri-apps/plugin-dialog": "2.0.0-rc.1",
"@tauri-apps/plugin-fs": "2.0.0-rc.2",
"@tauri-apps/plugin-process": "2.0.0-rc.1",
"@tauri-apps/plugin-store": "2.0.0-rc.1",
"@tauri-apps/plugin-updater": "2.0.0-rc.2",
"async-mutex": "^0.5.0",
"proxy-memoize": "3.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"proxy-memoize": "1.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.13",
"react-icons": "^5.2.1",
"react-redux": "^9.1.2",
"uuid": "^10.0.0",
"react-icons": "^5.3.0",
"react-redux": "^9.1.0",
"uuid": "^9.0.1",
"zod": "3.23.8"
},
"devDependencies": {
"@synnaxlabs/tsconfig": "workspace:*",
"@tauri-apps/cli": "2.0.0-beta.17",
"@types/react": "^18.3.3",
"@tauri-apps/cli": "2.0.0-rc.13",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^10.0.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint-config-synnaxlabs": "workspace:*",
"stylelint-config-synnaxlabs": "workspace:*",
"typescript": "^5.5.3",
"vite": "5.3.3",
"vite-tsconfig-paths": "4.3.2",
"vitest": "^1.6.0"
"typescript": "^5.6.2",
"vite": "5.4.4",
"vite-tsconfig-paths": "5.0.1",
"vitest": "^2.1.0"
}
}
14 changes: 7 additions & 7 deletions console/release-spec.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"version": "v0.28.6",
"version": "v0.29.1",
"notes": "Synnax Update",
"pub_date": "2024-09-13T20:06:37Z",
"pub_date": "2024-09-16T18:22:39Z",
"platforms": {
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRZ3h4ZmpWZnBGeURXZ3pneEJFblBxdkFtbmk5K0hzeCtWVVR0MU96TFhlWmZ4b1hRWHRva1NQdlh5Q1p2V2xtVTF5V2xndkxxRVVaMDRVak04aWtvSzBjUWVweENLcWdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2MjU3NjI3CWZpbGU6U3lubmF4LmFwcC50YXIuZ3oKQ3p0RHJ4cHF4d2tReStKUkhwZXRaNmhFemplT0dmaEJHWWEwNGR1YVRyNm5kWFcrUGNZN2lLLzlFRkFLdm5yajZMWnpPTXZhTVNoSE9PS3BQMUtQQlE9PQo=",
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.28.6-rc/Synnax.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRZ3h4ZmpWZnBGeUcvTHVJMW81S1B4L2xWM3NxRStIOHU3YkwxSjBOSEFkUjQ5OXpENzZZaGdVdGlDRkZYK1NXMWgrTjRYam1NN1ZsTW1idnZRc1p0YXovMnQ4cHhDaGc4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2NTEwODA0CWZpbGU6U3lubmF4LmFwcC50YXIuZ3oKWWN5NkphVGx0RCs5SUgyUllES3hwWmpERHgvRlZ2UlhlbzdiY0JtREh2bVF1Q0tJOVV0azdwb0d4V0hsVlpSbzZjWlBFUlMzZmZERERPZnpEUFFlQ1E9PQo=",
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.29.1-rc/Synnax.app.tar.gz"
},
"linux-x86_64": {
"signature": "not_supported_and_tauri_requires_an_entry",
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.28.6-rc/Synnax.app.tar.gz"
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.29.1-rc/Synnax.app.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRZ3h4ZmpWZnBGeURzYm9Ia2ZVd09vRlRVdGRVY1JLMkZ1Mk4xQWtpSlRpMnBWM1dBTWxzVXc2QmJ4b0N6REovTDFRUG4zR3VTZ25NSEVvR2dXbFdMZlpDNU95ZFhCSFEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2MjU3ODI0CWZpbGU6U3lubmF4XzAuMjguNl94NjRfZW4tVVMubXNpLnppcAp6U09XcGgwT3NrS0cwSExMVlIwV2dUU2FHSi9CSEg5cUczSi9DK3lBOG5TVzZ4Wmh0VG45VnNEbm5PYmJGVkxIZkhiV3ZiaVByTGFRcXRtUXhLemdDUT09Cg==",
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.28.6-rc/Synnax_0.28.6_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRZ3h4ZmpWZnBGeURLc0hsUW9IaDVDLzhyR3lWUExWRDBQb210bG9aV2IwSGkwMmVxNzBKcUdBS084TlAxelpqTmMwd2FxMlBraGJKcFU1aXY2S2RCY1VWNDh3SVJXS1FNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2NTEwNzE1CWZpbGU6U3lubmF4XzAuMjkuMV94NjRfZW4tVVMubXNpCjd3RzN1SE94VFdYNitKSVZyR0RXbmVXUXNGUklqQnFWeFV2L3dBbk1YdUhMaExaeFJleUlGYW1kODN4ZkVOSE9PVzRwVFQyMnhzWnYxUm91WjIzNER3PT0K",
"url": "https://github.com/synnaxlabs/synnax/releases/download/console-v0.29.1-rc/Synnax_0.29.1_x64_en-US.msi"
}
}
}
Loading

0 comments on commit 48c9e0d

Please sign in to comment.