Skip to content

Commit 8cf5c1d

Browse files
silverqxsilverqx
committed
workflows added TinyORM on LD_LIBRARY_/PATH
To avoid duplicate exports.
1 parent 68af157 commit 8cf5c1d

File tree

7 files changed

+28
-48
lines changed

7 files changed

+28
-48
lines changed

‎.github/workflows/clang-cl-qt6.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -725,11 +725,13 @@ jobs:
725725
run: |
726726
ccache.exe --show-stats -vv
727727
728+
- name: TinyORM add on the $env:Path
729+
run: |
730+
$env:TinyORMBuildTree >> $env:GITHUB_PATH
731+
728732
- name: Create and Seed tables for unit tests 🎉
729733
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
730734
run: >-
731-
$env:Path = '..\..;' + $env:Path
732-
733735
.\tom_testdata.exe migrate
734736
--database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
735737
--seed --no-ansi
@@ -784,8 +786,6 @@ jobs:
784786
- name: Tom example test some commands (MySQL) 🚀
785787
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
786788
run: |
787-
$env:Path = '..\..;' + $env:Path
788-
789789
.\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
790790
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
791791
.\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -810,8 +810,6 @@ jobs:
810810
- name: Tom example test some commands (PostgreSQL) 🙌
811811
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
812812
run: |
813-
$env:Path = '..\..;' + $env:Path
814-
815813
.\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
816814
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
817815
.\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -833,8 +831,6 @@ jobs:
833831
- name: Tom example test some commands (SQLite) 🏁
834832
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
835833
run: |
836-
$env:Path = '..\..;' + $env:Path
837-
838834
.\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
839835
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
840836
.\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi

‎.github/workflows/linux-qt5.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,13 @@ jobs:
311311
run: |
312312
ccache --show-stats -vv
313313
314+
- name: TinyORM add on the $LD_LIBRARY_PATH
315+
run: |
316+
echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
317+
314318
- name: Create and Seed tables for unit tests 🎉
315319
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
316320
run: >-
317-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
318-
319321
./tom_testdata migrate
320322
--database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
321323
--seed --no-ansi
@@ -358,8 +360,6 @@ jobs:
358360
- name: Tom example test some commands (MySQL) 🚀
359361
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
360362
run: |
361-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
362-
363363
./tom migrate:fresh --database=tinyorm_tom_mysql --no-ansi
364364
./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
365365
./tom migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -380,8 +380,6 @@ jobs:
380380
- name: Tom example test some commands (PostgreSQL) 🙌
381381
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
382382
run: |
383-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
384-
385383
./tom migrate:fresh --database=tinyorm_tom_postgres --no-ansi
386384
./tom migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
387385
./tom migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -402,8 +400,6 @@ jobs:
402400
- name: Tom example test some commands (SQLite) 🏁
403401
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
404402
run: |
405-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
406-
407403
./tom migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
408404
./tom migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
409405
./tom migrate:install --database=tinyorm_tom_sqlite --no-ansi

‎.github/workflows/linux-qt6-drivers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,14 @@ jobs:
259259
run: |
260260
ccache --show-stats -vv
261261
262+
- name: TinyORM add on the $LD_LIBRARY_PATH
263+
run: |
264+
echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
265+
262266
# Used migrate:fresh instead (is safer)
263267
- name: Create and Seed tables for unit tests 🎉
264268
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
265269
run: |
266-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
267-
268270
./tom_testdata migrate:fresh --database=tinyorm_testdata_tom_mysql --seed --no-ansi
269271
env:
270272
DB_MYSQL_CHARSET: ${{ secrets.DB_MYSQL_CHARSET }}
@@ -299,8 +301,6 @@ jobs:
299301
- name: Tom example test some commands (MySQL) 🚀
300302
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
301303
run: |
302-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
303-
304304
./tom migrate:fresh --database=tinyorm_tom_mysql --seed --no-ansi
305305
./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
306306
./tom migrate:install --database=tinyorm_tom_mysql --no-ansi

‎.github/workflows/linux-qt6.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -670,11 +670,13 @@ jobs:
670670
run: |
671671
ccache --show-stats -vv
672672
673+
- name: TinyORM add on the $LD_LIBRARY_PATH
674+
run: |
675+
echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
676+
673677
- name: Create and Seed tables for unit tests 🎉
674678
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
675679
run: >-
676-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
677-
678680
./tom_testdata migrate
679681
--database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
680682
--seed --no-ansi
@@ -725,8 +727,6 @@ jobs:
725727
- name: Tom example test some commands (MySQL) 🚀
726728
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
727729
run: |
728-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
729-
730730
./tom migrate:fresh --database=tinyorm_tom_mysql --no-ansi
731731
./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
732732
./tom migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -751,8 +751,6 @@ jobs:
751751
- name: Tom example test some commands (PostgreSQL) 🙌
752752
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
753753
run: |
754-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
755-
756754
./tom migrate:fresh --database=tinyorm_tom_postgres --no-ansi
757755
./tom migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
758756
./tom migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -773,8 +771,6 @@ jobs:
773771
- name: Tom example test some commands (SQLite) 🏁
774772
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
775773
run: |
776-
export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
777-
778774
./tom migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
779775
./tom migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
780776
./tom migrate:install --database=tinyorm_tom_sqlite --no-ansi

‎.github/workflows/msvc2019-qt5.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,13 @@ jobs:
474474
run: |
475475
ccache.exe --show-stats -vv
476476
477+
- name: TinyORM add on the $env:Path
478+
run: |
479+
$env:TinyORMBuildTree >> $env:GITHUB_PATH
480+
477481
- name: Create and Seed tables for unit tests 🎉
478482
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
479483
run: >-
480-
$env:Path = '..\..;' + $env:Path
481-
482484
.\tom_testdata.exe migrate
483485
--database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
484486
--seed --no-ansi
@@ -523,8 +525,6 @@ jobs:
523525
- name: Tom example test some commands (MySQL) 🚀
524526
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
525527
run: |
526-
$env:Path = '..\..;' + $env:Path
527-
528528
.\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
529529
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
530530
.\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -545,8 +545,6 @@ jobs:
545545
- name: Tom example test some commands (PostgreSQL) 🙌
546546
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
547547
run: |
548-
$env:Path = '..\..;' + $env:Path
549-
550548
.\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
551549
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
552550
.\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -567,8 +565,6 @@ jobs:
567565
- name: Tom example test some commands (SQLite) 🏁
568566
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
569567
run: |
570-
$env:Path = '..\..;' + $env:Path
571-
572568
.\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
573569
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
574570
.\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi

‎.github/workflows/msvc2022-qt6-drivers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,14 @@ jobs:
256256
run: |
257257
ccache.exe --show-stats -vv
258258
259+
- name: TinyORM add on the $env:Path
260+
run: |
261+
$env:TinyORMBuildTree >> $env:GITHUB_PATH
262+
259263
# Used migrate:fresh instead (is safer)
260264
- name: Create and Seed tables for unit tests 🎉
261265
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
262266
run: |
263-
$env:Path = '..\..;' + $env:Path
264-
265267
.\tom_testdata.exe migrate:fresh --database=tinyorm_testdata_tom_mysql --seed --no-ansi
266268
env:
267269
DB_MYSQL_CHARSET: ${{ secrets.DB_MYSQL_CHARSET }}
@@ -298,8 +300,6 @@ jobs:
298300
- name: Tom example test some commands (MySQL) 🚀
299301
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
300302
run: |
301-
$env:Path = '..\..;' + $env:Path
302-
303303
.\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
304304
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
305305
.\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi

‎.github/workflows/msvc2022-qt6.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -727,11 +727,13 @@ jobs:
727727
run: |
728728
ccache.exe --show-stats -vv
729729
730+
- name: TinyORM add on the $env:Path
731+
run: |
732+
$env:TinyORMBuildTree >> $env:GITHUB_PATH
733+
730734
- name: Create and Seed tables for unit tests 🎉
731735
working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
732736
run: >-
733-
$env:Path = '..\..;' + $env:Path
734-
735737
.\tom_testdata.exe migrate
736738
--database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
737739
--seed --no-ansi
@@ -784,8 +786,6 @@ jobs:
784786
- name: Tom example test some commands (MySQL) 🚀
785787
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
786788
run: |
787-
$env:Path = '..\..;' + $env:Path
788-
789789
.\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
790790
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
791791
.\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -810,8 +810,6 @@ jobs:
810810
- name: Tom example test some commands (PostgreSQL) 🙌
811811
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
812812
run: |
813-
$env:Path = '..\..;' + $env:Path
814-
815813
.\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
816814
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
817815
.\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -832,8 +830,6 @@ jobs:
832830
- name: Tom example test some commands (SQLite) 🏁
833831
working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
834832
run: |
835-
$env:Path = '..\..;' + $env:Path
836-
837833
.\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
838834
.\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
839835
.\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi

0 commit comments

Comments
 (0)