Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device into 875-Create-geo-coordinates-class

This commit is contained in:
Sam 2021-10-09 13:11:16 -04:00
commit ce7aae9ca0
4 changed files with 26 additions and 1 deletions

View File

@ -58,6 +58,19 @@ jobs:
run: |
pio upgrade
- name: Pull web ui
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "meshtastic/meshtastic-web"
file: "build.tar"
target: "build.tar"
token: ${{ secrets.GITHUB_TOKEN }}
- name: Unpack web ui
run: |
tar -xf build.tar -C data/static
rm build.tar
# We now run integration test before other build steps (to quickly see runtime failures)
- name: Build for native
run: platformio run -e native

View File

@ -47,6 +47,19 @@ jobs:
run: |
pio upgrade
- name: Pull web ui
uses: dsaltares/fetch-gh-release-asset@master
with:
repo: "meshtastic/meshtastic-web"
file: "build.tar"
target: "build.tar"
token: ${{ secrets.GITHUB_TOKEN }}
- name: Unpack web ui
run: |
tar -xf build.tar -C data/static
rm build.tar
# Will be available in steps.version.outputs.version
- name: Get version string
run: echo "::set-output name=version::$(./bin/buildinfo.py long)"

0
data/static/.gitkeep Normal file
View File

View File

@ -1 +0,0 @@
not yet supported - soon will be included in build