Merge remote-tracking branch 'upstream/master' into vite

This commit is contained in:
Anton Bracke 2021-05-29 08:55:06 +02:00
commit 117bf83c34
5 changed files with 99 additions and 36 deletions

44
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,44 @@
name: Release
on:
push:
tags:
- "*"
jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: '14'
- name: Install dependencies
run: |
cd webui/
npm install
- name: Build webui
run: |
cd webui/
npm run build
- name: Bundle webui release
run: |
cd webui/
tar -czvf ../webui.tar.gz build/
- name: Release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: |
webui.tar.gz
LICENSE

View File

@ -110,8 +110,6 @@ The daemon and the test have been tested with **Ubuntu 18.04** distro on **ARMv7
* Linux kernel version >= 4.10.x
* GCC version >= 7.x / clang >= 6.x (C++17 support required)
* cmake version >= 3.7
* node version >= 8.10.0
* npm version >= 3.5.2
* boost libraries version >= 1.65
* Avahi service discovery (if enabled) >= 0.7

View File

@ -26,10 +26,19 @@ fi
cd ..
cd webui
echo "Building and installing webui ..."
#npm install react-modal react-toastify react-router-dom
npm install
npm run build
if [ -f webui.tar.gz ]; then
rm -f webui.tar.gz
fi
echo "Downloading current webui release ..."
wget https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz
if [ -f webui.tar.gz ]; then
tar -xzvf webui.tar.gz
else
echo "Building and installing webui ..."
# npm install react-modal react-toastify react-router-dom
npm install
npm run build
fi
cd ..
cd daemon

View File

@ -9,7 +9,7 @@ sudo apt-get install -y build-essential
sudo apt-get install -y clang
sudo apt-get install -y git
sudo apt-get install -y cmake
sudo apt-get install -y npm
# sudo apt-get install -y npm
sudo apt-get install -y libboost-all-dev
sudo apt-get install -y valgrind
sudo apt-get install -y linux-sound-base alsa-base alsa-utils

View File

@ -20,5 +20,17 @@
"devDependencies": {
"@vitejs/plugin-react-refresh": "^1.3.3",
"vite": "^2.3.4"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}