caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust workflows

Browse Source
This commit is contained in:
Jan Käberich 2022-10-23 20:55:53 +02:00
parent 3a9d169d46
commit 44feac6e64
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/Build.yml vendored
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
PC_Application_Ubuntu: PC_Application_Ubuntu:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -21,7 +21,7 @@ jobs:
- name: Get build timestamp - name: Get build timestamp
id: id_date 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 - name: Get app version
id: id_version id: id_version
@ -30,7 +30,7 @@ jobs:
fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`grep -oP '(?<=FW_MINOR=)[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` 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 - name: Build application
run: | run: |
@ -56,21 +56,21 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '5.15.1' version: '5.15.2'
arch: 'win64_mingw81' arch: 'win64_mingw81'
- name: Download libusb - name: Download libusb
run: | 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 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 Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application\LibreVNA-GUI
shell: cmd shell: cmd
- name: Get build timestamp - name: Get build timestamp
shell: msys2 {0} shell: msys2 {0}
id: id_date 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 - name: Get app version
id: id_version id: id_version
@ -80,7 +80,7 @@ jobs:
fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`grep -oP '(?<=FW_MINOR=)[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` 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 - name: Build application
run: | run: |
@ -109,7 +109,7 @@ jobs:
path: Software/PC_Application/LibreVNA-GUI/release path: Software/PC_Application/LibreVNA-GUI/release
PC_Application_OSX: PC_Application_OSX:
runs-on: macos-10.15 runs-on: macos-11
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -123,7 +123,7 @@ jobs:
- name: Get build timestamp - name: Get build timestamp
id: id_date 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 - name: Get app version
id: id_version id: id_version
@ -132,7 +132,7 @@ jobs:
fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`pcregrep -o '(?<=FW_MINOR=)[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` 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 - name: Build application
run: | run: |
@ -162,7 +162,7 @@ jobs:
- name: Get build timestamp - name: Get build timestamp
id: id_date 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 - name: Get app version
id: id_version id: id_version
@ -172,7 +172,7 @@ jobs:
fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile`
fw_patch=`grep -oP '(?<=FW_PATCH=)[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"` 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 - name: Build application
run: | run: |

2
.github/workflows/Test.yml vendored
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
Tests: Tests:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1