simplify deploy actions, make static velconnect url available, smaller bugs

dev
Anton Franzluebbers 2023-07-26 12:17:37 -04:00
parent 42ee6458d9
commit 0c691cdefb
7 changed files with 7 additions and 25 deletions

View File

@ -2,7 +2,7 @@ name: Deploy to VelNet Oracle server (Pocketbase edition)
on: on:
push: push:
branches: ["feature/pocketbase-server"] branches: ["main"]
paths: ["velconnect/**"] paths: ["velconnect/**"]
jobs: jobs:
run_pull: run_pull:

View File

@ -1,20 +0,0 @@
name: Deploy to VelNet Oracle server
on:
push:
branches: ["main"]
paths: ["velconnect/**"]
jobs:
run_pull:
name: Pull new version
runs-on: ubuntu-latest
steps:
- name: install ssh keys
run: |
install -m 600 -D /dev/null ~/.ssh/id_rsa
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.SSH_HOST }} > ~/.ssh/known_hosts
- name: connect and pull
run: ssh ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "cd /home/ubuntu/VEL-Connect-v2/velconnect && git pull && docker compose up -d --build && exit"
- name: cleanup
run: rm -rf ~/.ssh

View File

@ -3,7 +3,6 @@ env:
on: on:
push: push:
branches: ["feature/pocketbase-server"]
paths: ["example_dashboard/**"] paths: ["example_dashboard/**"]
jobs: jobs:

View File

@ -19,6 +19,7 @@ namespace VELConnect
public class VELConnectManager : MonoBehaviour public class VELConnectManager : MonoBehaviour
{ {
public string velConnectUrl = "http://localhost"; public string velConnectUrl = "http://localhost";
public static string VelConnectUrl => instance.velConnectUrl;
private static VELConnectManager instance; private static VELConnectManager instance;
public class State public class State

View File

@ -1,7 +1,7 @@
{ {
"name": "edu.uga.engr.vel.vel-connect", "name": "edu.uga.engr.vel.vel-connect",
"displayName": "VEL-Connect", "displayName": "VEL-Connect",
"version": "2.0.2", "version": "2.0.3",
"unity": "2019.1", "unity": "2019.1",
"description": "Web-based configuration for VR applications", "description": "Web-based configuration for VR applications",
"keywords": [], "keywords": [],

View File

@ -1,6 +1,6 @@
{ {
"name": "@velaboratory/velconnect-svelte", "name": "@velaboratory/velconnect-svelte",
"version": "1.0.3", "version": "1.0.4",
"description": "Use VEL-Connect with a Svelte dashboard", "description": "Use VEL-Connect with a Svelte dashboard",
"main": "src/index.js", "main": "src/index.js",
"files": [ "files": [

View File

@ -29,6 +29,7 @@ export interface Device extends Record {
current_room: string; current_room: string;
current_app: string; current_app: string;
pairing_code: string; pairing_code: string;
last_online: string;
data: string; data: string;
expand: { data?: DataBlock }; expand: { data?: DataBlock };
} }
@ -229,7 +230,6 @@ export async function pair(pairingCode: string) {
.getFirstListItem(`pairing_code="${pairingCode}"`)) as Device; .getFirstListItem(`pairing_code="${pairingCode}"`)) as Device;
// add it to the local data // add it to the local data
currentDeviceId.set(device.id);
if (!get(pairedDevices).includes(device.id)) { if (!get(pairedDevices).includes(device.id)) {
pairedDevices.set([...get(pairedDevices), device.id]); pairedDevices.set([...get(pairedDevices), device.id]);
} }
@ -262,6 +262,8 @@ export async function pair(pairingCode: string) {
await pb.collection("Users").update(u.id, u); await pb.collection("Users").update(u.id, u);
} }
currentDeviceId.set(device.id);
return { error: null }; return { error: null };
} catch (e) { } catch (e) {
console.error("Not found: " + e); console.error("Not found: " + e);