Browse Source

Stable/Daily determination

Fix
Fix
Fix
Fix
Fix
Fix
Fix
Fix
Fix
QGC4.4
Don Gagne 3 years ago committed by Don Gagne
parent
commit
95d8deea2d
  1. 10
      .github/workflows/android_32_release.yml
  2. 10
      .github/workflows/android_64_release.yml
  3. 3
      .github/workflows/linux_debug.yml
  4. 3
      .github/workflows/linux_release.yml
  5. 3
      .github/workflows/macos_release.yml
  6. 3
      .github/workflows/windows_release.yml

10
.github/workflows/android_32_release.yml

@ -20,6 +20,7 @@ env: @@ -20,6 +20,7 @@ env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl32.apk
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -98,14 +99,7 @@ jobs: @@ -98,14 +99,7 @@ jobs:
env:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
run: |
if [ $GIT_BRANCH_NAME == "Stable*" ]; then
echo "Stable build" &&
export STABLE_OR_DAILY=StableBuild;
else
echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild;
fi
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="armeabi-v7a"
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="armeabi-v7a"
make -j2
- name: ccache post-run

10
.github/workflows/android_64_release.yml

@ -20,6 +20,7 @@ env: @@ -20,6 +20,7 @@ env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl64.apk
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -98,14 +99,7 @@ jobs: @@ -98,14 +99,7 @@ jobs:
env:
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
run: |
if [ $GIT_BRANCH_NAME == "Stable*" ]; then
echo "Stable build" &&
export STABLE_OR_DAILY=StableBuild;
else
echo "Daily build" &&
export STABLE_OR_DAILY=DailyBuild;
fi
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${STABLE_OR_DAILY} CONFIG+=installer ANDROID_ABIS="arm64-v8a"
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro -spec android-clang CONFIG+=${BUILD_TYPE} CONFIG+=installer ANDROID_ABIS="arm64-v8a"
make -j2
- name: ccache post-run

3
.github/workflows/linux_debug.yml

@ -15,6 +15,7 @@ defaults: @@ -15,6 +15,7 @@ defaults:
env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -77,7 +78,7 @@ jobs: @@ -77,7 +78,7 @@ jobs:
- name: Build
working-directory: ${{ runner.temp }}/shadow_build_dir
run: |
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=debug CONFIG+=DailyBuild
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=debug CONFIG+=${BUILD_TYPE}
make -j2
- name: ccache post-run

3
.github/workflows/linux_release.yml

@ -19,6 +19,7 @@ env: @@ -19,6 +19,7 @@ env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl.AppImage
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -86,7 +87,7 @@ jobs: @@ -86,7 +87,7 @@ jobs:
- name: Build
working-directory: ${{ runner.temp }}/shadow_build_dir
run: |
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=installer CONFIG+=DailyBuild
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=installer CONFIG+=${BUILD_TYPE}
make -j2
- name: ccache post-run

3
.github/workflows/macos_release.yml

@ -19,6 +19,7 @@ env: @@ -19,6 +19,7 @@ env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl.dmg
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -82,7 +83,7 @@ jobs: @@ -82,7 +83,7 @@ jobs:
- name: Build
working-directory: ${{ runner.temp }}/shadow_build_dir
run: |
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=installer CONFIG+=DailyBuild
qmake -r ${SOURCE_DIR}/qgroundcontrol.pro CONFIG+=installer CONFIG+=${BUILD_TYPE}
make -j3
- name: ccache post-run

3
.github/workflows/windows_release.yml

@ -19,6 +19,7 @@ env: @@ -19,6 +19,7 @@ env:
SOURCE_DIR: ${{ github.workspace }}
QT_VERSION: 5.15.2
ARTIFACT: QGroundControl-installer.exe
BUILD_TYPE: ${{ fromJSON('["DailyBuild", "StableBuild"]')[ github.ref_type == 'tag' || contains(github.ref, 'Stable_' ) ] }}
jobs:
build:
@ -85,7 +86,7 @@ jobs: @@ -85,7 +86,7 @@ jobs:
- name: Build
working-directory: ${{ runner.temp }}\shadow_build_dir
run: |
qmake -r ${{ env.SOURCE_DIR }}\qgroundcontrol.pro CONFIG+=installer CONFIG+=DailyBuild
qmake -r ${{ env.SOURCE_DIR }}\qgroundcontrol.pro CONFIG+=installer CONFIG+=$${ env. BUILD_TYPE }}
${{ runner.temp }}\jom\jom -j2
- name: Save installer artifact

Loading…
Cancel
Save