From f0b160e8d2afb2c99b23eeb40e87b4d09311e3cc Mon Sep 17 00:00:00 2001 From: silverqx Date: Thu, 13 Jun 2024 00:30:24 +0200 Subject: [PATCH] workflows bugfix $env:TinyQtSpecPlain --- .github/workflows/msvc2022-qt6-drivers.yml | 3 ++- .github/workflows/msvc2022-qt6.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml index 8d00d6501..6da07dc82 100644 --- a/.github/workflows/msvc2022-qt6-drivers.yml +++ b/.github/workflows/msvc2022-qt6-drivers.yml @@ -83,7 +83,8 @@ jobs: $tinyormBuildFolder "TinyORMBuildTree=$tinyormBuildTree" >> $env:GITHUB_ENV - $qtSpecPlain = $env:TINY_QT_SPEC.Split('_')[1..$env:TINY_QT_SPEC.Count] -join '_' + $qtSpecSplitted = $env:TINY_QT_SPEC.Split('_') + $qtSpecPlain = $qtSpecSplitted[1..($qtSpecSplitted.Count - 1)] -join '_' "TinyQtSpecPlain=$qtSpecPlain" >> $env:GITHUB_ENV - name: MySQL add libmysql.dll on the $env:Path, INCLUDE, and LIB diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml index 5ce3e094a..a9001fd9b 100644 --- a/.github/workflows/msvc2022-qt6.yml +++ b/.github/workflows/msvc2022-qt6.yml @@ -67,7 +67,8 @@ jobs: $mysqlDataPath = Join-Path -Path $runnerWorkPath -ChildPath 'mysql/data' "TinyMySQLDataPath=$mysqlDataPath" >> $env:GITHUB_ENV - $qtSpecPlain = $env:TINY_QT_SPEC.Split('_')[1..$env:TINY_QT_SPEC.Count] -join '_' + $qtSpecSplitted = $env:TINY_QT_SPEC.Split('_') + $qtSpecPlain = $qtSpecSplitted[1..($qtSpecSplitted.Count - 1)] -join '_' "TinyQtSpecPlain=$qtSpecPlain" >> $env:GITHUB_ENV "TinyParallel=$env:NUMBER_OF_PROCESSORS" >> $env:GITHUB_ENV