chore: Upgrade GitHub actions

This commit is contained in:
Lars Toenning
2024-02-16 17:32:58 +01:00
parent 2ba2d5bc8e
commit e3262b0568

View File

@@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Get version number - name: Get version number
@@ -42,13 +42,10 @@ jobs:
uses: swift-project/delete-artifact@swift uses: swift-project/delete-artifact@swift
with: with:
name: | name: |
xswiftbus-thin-allos-${{ steps.version.outputs.value }} xswiftbus-thin-*
xswiftbus-fat-allos-${{ steps.version.outputs.value }} xswiftbus-fat-*
swiftsymbols-allos-${{ steps.version.outputs.value }} swiftsymbols-*
swiftinstaller-linux-64-${{ steps.version.outputs.value }} swiftinstaller-*
swiftinstaller-windows-64-${{ steps.version.outputs.value }}
swiftinstaller-windows-32-${{ steps.version.outputs.value }}
swiftinstaller-macos-64-${{ steps.version.outputs.value }}
failOnError: false failOnError: false
warnIfNotFound: false warnIfNotFound: false
@@ -58,13 +55,13 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
- name: Run clang-format - name: Run clang-format
run: | run: |
scripts/run_clang_format.py scripts/run_clang_format.py
- uses: Trass3r/setup-cpp@master - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c
- name: Run cppcheck - name: Run cppcheck
run: | run: |
sudo apt-get -y install cppcheck sudo apt-get -y install cppcheck
@@ -79,7 +76,7 @@ jobs:
env: env:
DOXY_SRC_ROOT: .. DOXY_SRC_ROOT: ..
- name: Upload doxygen - name: Upload doxygen
uses: actions/upload-pages-artifact@v2 uses: actions/upload-pages-artifact@v3
with: with:
path: docs/html/ path: docs/html/
@@ -99,7 +96,7 @@ jobs:
cache: true cache: true
- name: Cache InstallBuilder - name: Cache InstallBuilder
id: cache-bitrock id: cache-bitrock
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/installbuilder.run path: ~/installbuilder.run
key: installbuilder-${{ env.bitrock_version }}-linux-x64 key: installbuilder-${{ env.bitrock_version }}-linux-x64
@@ -121,7 +118,7 @@ jobs:
sudo apt-get -y install dbus-x11 libglu1-mesa-dev libopus-dev libsodium-dev libpulse-dev libdbus-1-dev libevent-dev libpng-dev ninja-build sudo apt-get -y install dbus-x11 libglu1-mesa-dev libopus-dev libsodium-dev libpulse-dev libdbus-1-dev libevent-dev libpng-dev ninja-build
pip3 install requests pip3 install requests
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
@@ -140,7 +137,7 @@ jobs:
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- uses: Trass3r/setup-cpp@master - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c
- name: Build swift (without symbols) - name: Build swift (without symbols)
if: ${{ env.do_symbols != 'true' }} if: ${{ env.do_symbols != 'true' }}
run: | run: |
@@ -150,20 +147,20 @@ jobs:
run: | run: |
python3 -u scripts/build.py -w 64 -t gcc -d -j2 -q "-DVATSIM_KEY_JSON=$vatsim_key_file" --upload python3 -u scripts/build.py -w 64 -t gcc -d -j2 -q "-DVATSIM_KEY_JSON=$vatsim_key_file" --upload
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: swiftinstaller-linux-64-${{ needs.preBuild.outputs.version }} name: swiftinstaller-linux-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ env.do_symbols == 'true' }} if: ${{ env.do_symbols == 'true' }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-linux-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
- name: Upload xswiftbus - name: Upload xswiftbus
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }} name: xswiftbus-thin-linux-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/xswiftbus-* path: ${{ github.workspace }}/xswiftbus-*
buildWin64: buildWin64:
@@ -191,7 +188,7 @@ jobs:
extra: --archives qtbase extra: --archives qtbase
- name: Cache InstallBuilder - name: Cache InstallBuilder
id: cache-bitrock id: cache-bitrock
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: C:\installbuilder.exe path: C:\installbuilder.exe
key: installbuilder-${{ env.bitrock_version }}-windows-x64 key: installbuilder-${{ env.bitrock_version }}-windows-x64
@@ -214,7 +211,7 @@ jobs:
run: | run: |
pip install requests PyInstaller pip install requests PyInstaller
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
@@ -228,7 +225,7 @@ jobs:
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- uses: Trass3r/setup-cpp@master - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c
- name: Build swift (without symbols) - name: Build swift (without symbols)
if: ${{ env.do_symbols != 'true' }} if: ${{ env.do_symbols != 'true' }}
run: | run: |
@@ -238,20 +235,20 @@ jobs:
run: | run: |
python -u scripts/build.py -w 64 -t msvc -d -q "-DVATSIM_KEY_JSON=$env:vatsim_key_file" --upload python -u scripts/build.py -w 64 -t msvc -d -q "-DVATSIM_KEY_JSON=$env:vatsim_key_file" --upload
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: swiftinstaller-windows-64-${{ needs.preBuild.outputs.version }} name: swiftinstaller-windows-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ env.do_symbols == 'true' }} if: ${{ env.do_symbols == 'true' }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-windows-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
- name: Upload xswiftbus - name: Upload xswiftbus
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }} name: xswiftbus-thin-windows-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/xswiftbus-* path: ${{ github.workspace }}/xswiftbus-*
buildWin32: buildWin32:
@@ -279,7 +276,7 @@ jobs:
extra: --archives qtbase extra: --archives qtbase
- name: Cache InstallBuilder - name: Cache InstallBuilder
id: cache-bitrock id: cache-bitrock
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: C:\installbuilder.exe path: C:\installbuilder.exe
key: installbuilder-${{ env.bitrock_version }}-windows key: installbuilder-${{ env.bitrock_version }}-windows
@@ -302,7 +299,7 @@ jobs:
run: | run: |
pip install requests PyInstaller pip install requests PyInstaller
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
@@ -316,7 +313,7 @@ jobs:
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- uses: Trass3r/setup-cpp@master - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c
- name: Build swift (without symbols) - name: Build swift (without symbols)
if: ${{ env.do_symbols != 'true' }} if: ${{ env.do_symbols != 'true' }}
run: | run: |
@@ -326,15 +323,15 @@ jobs:
run: | run: |
python -u scripts/build.py -w 32 -t msvc -d -q "-DVATSIM_KEY_JSON=$env:vatsim_key_file" --upload python -u scripts/build.py -w 32 -t msvc -d -q "-DVATSIM_KEY_JSON=$env:vatsim_key_file" --upload
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: swiftinstaller-windows-32-${{ needs.preBuild.outputs.version }} name: swiftinstaller-windows-32-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ env.do_symbols == 'true' }} if: ${{ env.do_symbols == 'true' }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-windows-32-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
buildMacOS: buildMacOS:
@@ -353,7 +350,7 @@ jobs:
cache: true cache: true
- name: Cache InstallBuilder - name: Cache InstallBuilder
id: cache-bitrock id: cache-bitrock
uses: actions/cache@v3 uses: actions/cache@v4
with: with:
path: ~/installbuilder.dmg path: ~/installbuilder.dmg
key: installbuilder-${{ env.bitrock_version }}-osx key: installbuilder-${{ env.bitrock_version }}-osx
@@ -380,7 +377,7 @@ jobs:
run: | run: |
pip3 install requests pip3 install requests
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
@@ -394,7 +391,7 @@ jobs:
env: env:
VATSIM_ID: ${{ secrets.VATSIM_ID }} VATSIM_ID: ${{ secrets.VATSIM_ID }}
VATSIM_KEY: ${{ secrets.VATSIM_KEY }} VATSIM_KEY: ${{ secrets.VATSIM_KEY }}
- uses: Trass3r/setup-cpp@master - uses: Trass3r/setup-cpp@1b63900ecf3f0b7c60ee53aa7be122f2c4fe7a2c
- name: Build swift (without symbols) - name: Build swift (without symbols)
if: ${{ env.do_symbols != 'true' }} if: ${{ env.do_symbols != 'true' }}
run: | run: |
@@ -404,20 +401,20 @@ jobs:
run: | run: |
python3 -u scripts/build.py -w 64 -t clang -d -j2 -q "-DVATSIM_KEY_JSON=$vatsim_key_file" --upload python3 -u scripts/build.py -w 64 -t clang -d -j2 -q "-DVATSIM_KEY_JSON=$vatsim_key_file" --upload
- name: Upload installer - name: Upload installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: swiftinstaller-macos-64-${{ needs.preBuild.outputs.version }} name: swiftinstaller-macos-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftinstaller-* path: ${{ github.workspace }}/swiftinstaller-*
- name: Upload symbols - name: Upload symbols
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: ${{ env.do_symbols == 'true' }} if: ${{ env.do_symbols == 'true' }}
with: with:
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }} name: swiftsymbols-macos-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/swiftsymbols-* path: ${{ github.workspace }}/swiftsymbols-*
- name: Upload xswiftbus - name: Upload xswiftbus
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }} name: xswiftbus-thin-macos-64-${{ needs.preBuild.outputs.version }}
path: ${{ github.workspace }}/xswiftbus-* path: ${{ github.workspace }}/xswiftbus-*
postBuild: postBuild:
@@ -426,9 +423,10 @@ jobs:
steps: steps:
- name: Download xswiftbus-thin - name: Download xswiftbus-thin
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
with: with:
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }} pattern: xswiftbus-thin-*
merge-multiple: true
- name: Repackage xswiftbus - name: Repackage xswiftbus
run: | run: |
7z x -y xswiftbus-windows-64-*.7z 7z x -y xswiftbus-windows-64-*.7z
@@ -436,14 +434,14 @@ jobs:
7z x -y xswiftbus-macos-64-*.7z 7z x -y xswiftbus-macos-64-*.7z
7z a -y -mx=9 xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }}.7z xswiftbus 7z a -y -mx=9 xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }}.7z xswiftbus
- name: Upload xswiftbus-fat - name: Upload xswiftbus-fat
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }} name: xswiftbus-fat-allos-${{ needs.preBuild.outputs.version }}
path: xswiftbus-fat-allos-* path: xswiftbus-fat-allos-*
- name: Remove xswiftbus-thin - name: Remove xswiftbus-thin artifacts
uses: swift-project/delete-artifact@swift uses: swift-project/delete-artifact@swift
with: with:
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }} name: xswiftbus-thin-*
release: release:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
@@ -459,7 +457,7 @@ jobs:
steps: steps:
- name: Download artifacts - name: Download artifacts
uses: actions/download-artifact@v3 uses: actions/download-artifact@v4
- name: Flatten directories - name: Flatten directories
run: | run: |
mv swiftinstaller-*/* . mv swiftinstaller-*/* .