Skip to content

Commit 82ce845

Browse files
committed
Merge branch 'develop' of https://github.com/mirte-robot/mirte-web-interface into develop
2 parents 9e2d6fb + 29d9126 commit 82ce845

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+15816
-1287
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Node.js Build
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
build_backend:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v4
17+
with:
18+
node-version: '16'
19+
check-latest: true
20+
21+
- name: Install dependencies
22+
run: |
23+
cd nodejs-backend
24+
npm install
25+
npm rebuild
26+
- name: Run build
27+
run: |
28+
cd nodejs-backend
29+
exit_status=0
30+
timeout 60 npm run backend || exit_status=$?
31+
32+
if [[ $exit_status -eq 124 ]]; then
33+
echo "Backend ran good!"
34+
else
35+
echo "Backend run failed!"
36+
exit 1
37+
fi
38+
39+
# - name: Run tests
40+
# run: npm test
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Node.js Build
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
15+
- name: Set up Node.js
16+
uses: actions/setup-node@v4
17+
with:
18+
node-version: 'current'
19+
check-latest: true
20+
21+
- name: Install dependencies
22+
run: |
23+
cd vue-frontend
24+
npm install
25+
- name: Run build
26+
run: |
27+
cd vue-frontend
28+
npm run build
29+
30+
# - name: Run tests
31+
# run: npm test

nodejs-backend/services.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
1515
fs = require('fs')
1616

1717
// FIXME: This needs to change to the correct config location. Doesn't work nicely with pre-compiled packages.
18-
const mirte_user_config_file = '/home/mirte/mirte_ws/src/mirte-ros-packages/mirte_telemetrix/config/mirte_user_config.yaml';
18+
const mirte_user_config_file = '/home/mirte/mirte_ws/src/mirte-ros-packages/mirte_bringup/telemetrix_config/mirte_user_config.yaml';
1919

2020

2121
// TODO: Currently the local-ip package is not working

vue-frontend/babel.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
plugins: [
3+
['@babel/plugin-proposal-nullish-coalescing-operator'],
4+
['@babel/plugin-proposal-optional-chaining']
5+
]
6+
}

0 commit comments

Comments
 (0)