diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee49842a2a..da9c8d0c98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,104 +176,6 @@ jobs: name: xswiftbus-thin-linux-64-${{ needs.preBuild.outputs.version }} path: ${{ github.workspace }}/xswiftbus-* - buildWin64: - runs-on: windows-2022 - needs: [preBuild, checks] - env: - BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }} - BACKTRACE_MINIDUMP_TOKEN: ${{ secrets.BACKTRACE_MINIDUMP_TOKEN }} - BITROCK_BUILDER: "~/installbuilder/bin/builder-cli.exe" - - steps: - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - version: ${{ env.qt_version }} - modules: 'qtmultimedia qt5compat' - arch: win64_msvc2022_64 - cache: true - - name: Install Qt debug info - uses: jurplel/install-qt-action@v4 - with: - version: ${{ env.qt_version }} - arch: win64_msvc2022_64 - cache: true - modules: debug_info - extra: --archives qtbase - - name: Cache InstallBuilder - id: cache-bitrock - uses: actions/cache@v4 - with: - path: C:\installbuilder.exe - key: installbuilder-${{ env.bitrock_version }}-windows-x64 - - name: Download InstallBuilder - if: steps.cache-bitrock.outputs.cache-hit != 'true' - shell: C:\msys64\usr\bin\bash.exe -le {0} - run: | - wget --retry-connrefused -t 10 -w 10 -T 60 -O /c/installbuilder.exe ${{ env.bitrock_url }}/installbuilder-${{ env.bitrock_version }}-windows-x64-installer.exe - env: - MSYSTEM: MSYS2 - - name: Install InstallBuilder - run: | - start -wait "C:\installbuilder.exe" @("--mode", "unattended", "--prefix", "$HOME\installbuilder") - echo >$HOME\license.xml @" - $env:BITROCK_LICENSE - "@ - env: - BITROCK_LICENSE: ${{ secrets.BITROCK_LICENSE }} - - name: Install dependencies - run: | - pip install requests PyInstaller - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: true - fetch-depth: 0 - - name: Checkout externals - if: ${{ env.use_externals == 'true' }} - uses: actions/checkout@v4 - env: - EXTERNALS_PAT: ${{ secrets.EXTERNALS_PAT }} - with: - repository: ${{ env.externals }} - ref: ${{ env.externals_sha }} - token: ${{ env.EXTERNALS_PAT }} - path: 'third_party/externals' - - name: Create Vatsim key file - if: ${{ env.do_vatsim_key == 'true' }} - run: | - echo >vatsim.json @" - { "vatsim": { "id": "$env:VATSIM_ID", "key": "$env:VATSIM_KEY" } } - "@ - env: - VATSIM_ID: ${{ secrets.VATSIM_ID }} - VATSIM_KEY: ${{ secrets.VATSIM_KEY }} - - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c - - name: Build swift (without symbols) - if: ${{ env.do_symbols != 'true' }} - run: | - python -u scripts/build.py -w 64 -t msvc - - name: Build swift (with symbols) - if: ${{ env.do_symbols == 'true' }} - run: | - python -u scripts/build.py -w 64 -t msvc --upload-symbols - - name: Upload installer - uses: actions/upload-artifact@v4 - with: - name: swiftinstaller-windows-64-${{ needs.preBuild.outputs.version }} - path: ${{ github.workspace }}/swiftinstaller-* - - name: Upload symbols - uses: actions/upload-artifact@v4 - if: ${{ env.do_symbols == 'true' }} - with: - name: swiftsymbols-windows-64-${{ needs.preBuild.outputs.version }} - path: ${{ github.workspace }}/swiftsymbols-* - - name: Upload xswiftbus - uses: actions/upload-artifact@v4 - with: - name: xswiftbus-thin-windows-64-${{ needs.preBuild.outputs.version }} - path: ${{ github.workspace }}/xswiftbus-* - buildMacOS: runs-on: macos-13 needs: [preBuild, checks] @@ -369,7 +271,7 @@ jobs: postBuild: runs-on: ubuntu-22.04 - needs: [preBuild, checks, buildLinux, buildWin64, buildMacOS] + needs: [preBuild, checks, buildLinux, buildMacOS] steps: - name: Download xswiftbus-thin @@ -379,7 +281,6 @@ jobs: merge-multiple: true - name: Repackage xswiftbus run: | - 7z x -y xswiftbus-windows-64-*.7z 7z x -y xswiftbus-linux-64-*.7z 7z x -y xswiftbus-macos-64-*.7z 7z a -y -mx=9 xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }}.7z xswiftbus @@ -427,7 +328,6 @@ jobs: gzip: folders files: > swiftinstaller-linux-64-${{ needs.preBuild.outputs.version }}.run - swiftinstaller-windows-64-${{ needs.preBuild.outputs.version }}.exe swiftinstaller-macos-64-${{ needs.preBuild.outputs.version }}.dmg xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }}.7z swiftsymbols-allos-${{ needs.preBuild.outputs.version }}:swiftsymbols @@ -436,7 +336,7 @@ jobs: notify: runs-on: ubuntu-22.04 - needs: [preBuild, checks, buildLinux, buildWin64, buildMacOS, postBuild, release] + needs: [preBuild, checks, buildLinux, buildMacOS, postBuild, release] if: always() steps: