diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index ba6c46a..8c08dff 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -10,7 +10,7 @@ on: jobs: PC_Application_Ubuntu: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 @@ -21,7 +21,7 @@ jobs: - name: Get build timestamp id: id_date - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT - name: Get app version id: id_version @@ -30,7 +30,7 @@ jobs: fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` - echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" + echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT - name: Build application run: | @@ -56,21 +56,21 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.15.1' + version: '5.15.2' arch: 'win64_mingw81' - name: Download libusb run: | - curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z + curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z 7z x libusb.7z -r -olibusb - Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include + Xcopy /E /I /Y libusb\include ..\Qt\5.15.2\mingw81_64\include Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application\LibreVNA-GUI shell: cmd - name: Get build timestamp shell: msys2 {0} id: id_date - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT - name: Get app version id: id_version @@ -80,7 +80,7 @@ jobs: fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` - echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" + echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT - name: Build application run: | @@ -109,7 +109,7 @@ jobs: path: Software/PC_Application/LibreVNA-GUI/release PC_Application_OSX: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v1 @@ -123,7 +123,7 @@ jobs: - name: Get build timestamp id: id_date - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT - name: Get app version id: id_version @@ -132,7 +132,7 @@ jobs: fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` - echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" + echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT - name: Build application run: | @@ -162,7 +162,7 @@ jobs: - name: Get build timestamp id: id_date - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT - name: Get app version id: id_version @@ -172,7 +172,7 @@ jobs: fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' Makefile` hw_revision=`grep "DHW_REVISION=" Makefile | sed "s/-DHW_REVISION=\"'//" | sed "sr'\" [\]rr"` - echo "::set-output name=app_version::hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" + echo "app_version=hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT - name: Build application run: | diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 10eea7e..d692385 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -10,7 +10,7 @@ on: jobs: Tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1