From 93181869efc9ac081d705d5bbc7c52dfdc999158 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Wed, 17 Jun 2020 00:23:18 +0100
Subject: [PATCH] [CI] Refactoring

---
 .github/workflows/build.yml | 126 +++++++++++++++++-------------------
 mkspecs/features/config.pri |   1 -
 2 files changed, 60 insertions(+), 67 deletions(-)

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