flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CI] Refactoring

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-06-17 00:23:18 +01:00
parent 2b76e8592a
commit 93181869ef
2 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
.github/workflows/build.yml vendored
View File

@@ -11,8 +11,6 @@ env:
do_symbols: ${{ startsWith(github.ref, 'refs/heads/develop/') }} do_symbols: ${{ startsWith(github.ref, 'refs/heads/develop/') }}
do_vatsim_key: ${{ github.event_name == 'push' }} do_vatsim_key: ${{ github.event_name == 'push' }}
eol_months: 12 eol_months: 12
BASH_KEY_ARGS: -q 'SWIFT_CONFIG.vatsim.id=$$(VATSIM_ID)' -q 'SWIFT_CONFIG.vatsim.key=$$(VATSIM_KEY)'
PWSH_KEY_ARGS: --% -q "SWIFT_CONFIG.vatsim.id=$$(VATSIM_ID)" -q "SWIFT_CONFIG.vatsim.key=$$(VATSIM_KEY)"
jobs: jobs:
@@ -71,27 +69,26 @@ jobs:
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Build swift (without vatsim key, without symbols) - name: Create Vatsim key file
if: ${{ ! env.do_vatsim_key }} if: ${{ env.do_vatsim_key }}
run: | run: |
python3 -u scripts/build.py -w 64 -t gcc -d -j2 -e $eol_months cat >vatsim.json <<EOF
ls -l error.log { "vatsim": { "id": "$VATSIM_ID", "key": "$VATSIM_KEY" } }
- name: Build swift (with vatsim key, without symbols) EOF
if: ${{ env.do_vatsim_key && ! env.do_symbols }} echo "::set-env name=vatsim_key_file::vatsim.json"
run: |
python3 -u scripts/build.py -w 64 -t gcc -d -j2 -e $eol_months $BASH_KEY_ARGS
ls -l error.log
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Build swift (with vatsim key, with symbols) - name: Build swift (without symbols)
if: ${{ env.do_vatsim_key && env.do_symbols }} if: ${{ ! (env.do_symbols && env.do_vatsim_key) }}
run: | run: |
python3 -u scripts/build.py -w 64 -t gcc -d -j2 -e $eol_months $BASH_KEY_ARGS --upload python3 -u scripts/build.py -w 64 -t gcc -d -j2 -e $eol_months -q "SWIFT_CONFIG_JSON+=$vatsim_key_file"
ls -l error.log
- name: Build swift (with symbols)
if: ${{ env.do_symbols && env.do_vatsim_key }}
run: |
python3 -u scripts/build.py -w 64 -t gcc -d -j2 -e $eol_months -q "SWIFT_CONFIG_JSON+=$vatsim_key_file" --upload
ls -l error.log ls -l error.log
env:
VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@@ -99,7 +96,7 @@ jobs:
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ env.do_symbols }} if: ${{ env.do_symbols && env.do_vatsim_key }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
@@ -135,27 +132,26 @@ jobs:
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Build swift (without vatsim key, without symbols) - name: Create Vatsim key file
if: ${{ ! env.do_vatsim_key }} if: ${{ env.do_vatsim_key }}
run: | run: |
python.exe -u scripts\build.py -w 64 -t msvc -d -e $env:eol_months echo >vatsim.json @"
dir error.log { "vatsim": { "id": "$env:VATSIM_ID", "key": "$env:VATSIM_KEY" } }
- name: Build swift (with vatsim key, without symbols) "@
if: ${{ env.do_vatsim_key && ! env.do_symbols }} echo "::set-env name=vatsim_key_file::vatsim.json"
run: |
python.exe -u scripts\build.py -w 64 -t msvc -d -e $env:eol_months ${{ env.PWSH_KEY_ARGS }}
dir error.log
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Build swift (with vatsim key, with symbols) - name: Build swift (without symbols)
if: ${{ env.do_vatsim_key && env.do_symbols }} if: ${{ ! (env.do_symbols && env.do_vatsim_key) }}
run: | run: |
python.exe -u scripts\build.py -w 64 -t msvc -d -e $env:eol_months ${{ env.PWSH_KEY_ARGS }} --upload python.exe -u scripts\build.py -w 64 -t msvc -d -e $env:eol_months -q "SWIFT_CONFIG_JSON+=$env:vatsim_key_file"
dir error.log
- name: Build swift (with symbols)
if: ${{ env.do_symbols && env.do_vatsim_key }}
run: |
python.exe -u scripts\build.py -w 64 -t msvc -d -e $env:eol_months -q "SWIFT_CONFIG_JSON+=$env:vatsim_key_file" --upload
dir error.log dir error.log
env:
VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@@ -163,7 +159,7 @@ jobs:
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ env.do_symbols }} if: ${{ env.do_symbols && env.do_vatsim_key }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
@@ -199,27 +195,26 @@ jobs:
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Build swift (without vatsim key, without symbols) - name: Create Vatsim key file
if: ${{ ! env.do_vatsim_key }} if: ${{ env.do_vatsim_key }}
run: | run: |
python.exe -u scripts\build.py -w 32 -t msvc -d -e $env:eol_months echo >vatsim.json @"
dir error.log { "vatsim": { "id": "$env:VATSIM_ID", "key": "$env:VATSIM_KEY" } }
- name: Build swift (with vatsim key, without symbols) "@
if: ${{ env.do_vatsim_key && ! env.do_symbols }} echo "::set-env name=vatsim_key_file::vatsim.json"
run: |
python.exe -u scripts\build.py -w 32 -t msvc -d -e $env:eol_months ${{ env.PWSH_KEY_ARGS }}
dir error.log
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Build swift (with vatsim key, with symbols) - name: Build swift (without symbols)
if: ${{ env.do_vatsim_key && env.do_symbols }} if: ${{ ! (env.do_symbols && env.do_vatsim_key) }}
run: | run: |
python.exe -u scripts\build.py -w 32 -t msvc -d -e $env:eol_months ${{ env.PWSH_KEY_ARGS }} --upload python.exe -u scripts\build.py -w 32 -t msvc -d -e $env:eol_months -q "SWIFT_CONFIG_JSON+=$env:vatsim_key_file"
dir error.log
- name: Build swift (with symbols)
if: ${{ env.do_symbols && env.do_vatsim_key }}
run: |
python.exe -u scripts\build.py -w 32 -t msvc -d -e $env:eol_months -q "SWIFT_CONFIG_JSON+=$env:vatsim_key_file" --upload
dir error.log dir error.log
env:
VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@@ -227,7 +222,7 @@ jobs:
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ env.do_symbols }} if: ${{ env.do_symbols && env.do_vatsim_key }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
@@ -268,27 +263,26 @@ jobs:
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Build swift (without vatsim key, without symbols) - name: Create Vatsim key file
if: ${{ ! env.do_vatsim_key }} if: ${{ env.do_vatsim_key }}
run: | run: |
python3 -u scripts/build.py -w 64 -t clang -d -j2 -e $eol_months cat >vatsim.json <<EOF
ls -l error.log { "vatsim": { "id": "$VATSIM_ID", "key": "$VATSIM_KEY" } }
- name: Build swift (with vatsim key, without symbols) EOF
if: ${{ env.do_vatsim_key && ! env.do_symbols }} echo "::set-env name=vatsim_key_file::vatsim.json"
run: |
python3 -u scripts/build.py -w 64 -t clang -d -j2 -e $eol_months $BASH_KEY_ARGS
ls -l error.log
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Build swift (with vatsim key, with symbols) - name: Build swift (without symbols)
if: ${{ env.do_vatsim_key && env.do_symbols }} if: ${{ ! (env.do_symbols && env.do_vatsim_key) }}
run: | run: |
python3 -u scripts/build.py -w 64 -t clang -d -j2 -e $eol_months $BASH_KEY_ARGS --upload python3 -u scripts/build.py -w 64 -t clang -d -j2 -e $eol_months -q "SWIFT_CONFIG_JSON+=$vatsim_key_file"
ls -l error.log
- name: Build swift (with symbols)
if: ${{ env.do_symbols && env.do_vatsim_key }}
run: |
python3 -u scripts/build.py -w 64 -t clang -d -j2 -e $eol_months -q "SWIFT_CONFIG_JSON+=$vatsim_key_file" --upload
ls -l error.log ls -l error.log
env:
VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@@ -296,7 +290,7 @@ jobs:
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
if: ${{ env.do_symbols }} if: ${{ env.do_symbols && env.do_vatsim_key }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*

1
mkspecs/features/config.pri
View File

@@ -82,7 +82,6 @@ defineTest(swiftConfig) {
} }
defineReplace(swiftConfig) { defineReplace(swiftConfig) {
eval(value = \$\${SWIFT_CONFIG.$$1}) eval(value = \$\${SWIFT_CONFIG.$$1})
eval(value = $$value)
return($$value) return($$value)
} }