piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(minor): Better showing of version info in firmware and cpn, remove seperate cpn32 build script (#1913)

Browse Source 
* fix: Prevent potential wordsplitting of variables

* chore: Remove need for separate cpn 32bit script

* Build script tag/branch/PR auto-detection

* Teach companion about VERSION_TAG

* Update some constant names

* Only one companion build script

* Actually use `VERSION_SUFFIX` in about screen 🤦

* Add space

* Remove line that was only for testing 32bit build

* Remove hyphen between win and bits

* Show codename in Settings -> Version

* cpn: Only show codename on tagged versions

* Update about screen also

* Double quotes around codename on colorlcd

* Update copyright year

* About screen should use VERSION_TAG when set
This commit is contained in:
Peter Feerick
2022-05-08 16:24:31 +10:00
committed by GitHub
parent 5196c2a916
commit b0e3cb015f
16 changed files with 80 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux_cpn.yml
+3 -3
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/linux_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/linux_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -48,7 +48,7 @@ jobs:
shell: bash
run: |
mkdir output && \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
.github/workflows/macosx_cpn.yml
+3 -3
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/macosx_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/macosx_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -93,7 +93,7 @@ jobs:
shell: bash
run: |
mkdir output && \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
.github/workflows/win-cpn-32.yml
+4 -4
View File
@@ -9,7 +9,7 @@ on:
paths:
- '.github/workflows/win_cpn-32.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -17,7 +17,7 @@ on:
paths:
- '.github/workflows/win_cpn-32.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -91,10 +91,10 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
tools/build-companion-nightly-win32.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
run: echo "artifact_name=edgetx-cpn-win-32-${GITHUB_REF##*/}" >> $GITHUB_ENV
run: echo "artifact_name=edgetx-cpn-win32-${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Archive production artifacts
uses: actions/upload-artifact@v2
.github/workflows/win_cpn-64.yml
+4 -4
View File
@@ -11,7 +11,7 @@ on:
paths:
- '.github/workflows/win_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
pull_request:
branches:
@@ -21,7 +21,7 @@ on:
paths:
- '.github/workflows/win_cpn.yml'
- 'companion/**'
- 'tools/build-companion-nightly.sh'
- 'tools/build-companion.sh'
workflow_dispatch:
@@ -94,11 +94,11 @@ jobs:
run: |
mkdir output && \
CMAKE_PREFIX_PATH=$RUNNER_WORKSPACE/Qt/$QT_VERSION/$MINGW_PATH \
tools/build-companion-nightly.sh "$(pwd)" "$(pwd)/output/"
tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
- name: Compose release filename
# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
run: echo "artifact_name=edgetx-cpn-win-64-${GITHUB_REF##*/}" >> $GITHUB_ENV
run: echo "artifact_name=edgetx-cpn-win64-${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Archive production artifacts
uses: actions/upload-artifact@v2