workflows added TinyORM on LD_LIBRARY_/PATH

To avoid duplicate exports.
silverqx · Jun 12, 2024 · 8cf5c1d · 8cf5c1d
1 parent 68af157
commit 8cf5c1d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 48 deletions.
diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
@@ -725,11 +725,13 @@ jobs:
       run: |
         ccache.exe --show-stats -vv
 
+    - name: TinyORM add on the $env:Path
+      run: |
+        $env:TinyORMBuildTree >> $env:GITHUB_PATH
+
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: >-
-        $env:Path = '..\..;' + $env:Path
-
         .\tom_testdata.exe migrate
         --database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
         --seed --no-ansi
@@ -784,8 +786,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -810,8 +810,6 @@ jobs:
     - name: Tom example test some commands (PostgreSQL) 🙌
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -833,8 +831,6 @@ jobs:
     - name: Tom example test some commands (SQLite) 🏁
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi

diff --git a/.github/workflows/linux-qt5.yml b/.github/workflows/linux-qt5.yml
@@ -311,11 +311,13 @@ jobs:
       run: |
         ccache --show-stats -vv
 
+    - name: TinyORM add on the $LD_LIBRARY_PATH
+      run: |
+        echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
+
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: >-
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom_testdata migrate
         --database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
         --seed --no-ansi
@@ -358,8 +360,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         ./tom migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -380,8 +380,6 @@ jobs:
     - name: Tom example test some commands (PostgreSQL) 🙌
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_postgres --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
         ./tom migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -402,8 +400,6 @@ jobs:
     - name: Tom example test some commands (SQLite) 🏁
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
         ./tom migrate:install --database=tinyorm_tom_sqlite --no-ansi

diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml
@@ -259,12 +259,14 @@ jobs:
       run: |
         ccache --show-stats -vv
 
+    - name: TinyORM add on the $LD_LIBRARY_PATH
+      run: |
+        echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
+
     # Used migrate:fresh instead (is safer)
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom_testdata migrate:fresh --database=tinyorm_testdata_tom_mysql --seed --no-ansi
       env:
         DB_MYSQL_CHARSET: ${{ secrets.DB_MYSQL_CHARSET }}
@@ -299,8 +301,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_mysql --seed --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         ./tom migrate:install --database=tinyorm_tom_mysql --no-ansi

diff --git a/.github/workflows/linux-qt6.yml b/.github/workflows/linux-qt6.yml
@@ -670,11 +670,13 @@ jobs:
       run: |
         ccache --show-stats -vv
 
+    - name: TinyORM add on the $LD_LIBRARY_PATH
+      run: |
+        echo "LD_LIBRARY_PATH=$TinyORMBuildTree${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $env:GITHUB_ENV
+
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: >-
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom_testdata migrate
         --database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
         --seed --no-ansi
@@ -725,8 +727,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         ./tom migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -751,8 +751,6 @@ jobs:
     - name: Tom example test some commands (PostgreSQL) 🙌
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_postgres --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
         ./tom migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -773,8 +771,6 @@ jobs:
     - name: Tom example test some commands (SQLite) 🏁
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        export LD_LIBRARY_PATH=../..${LD_LIBRARY_PATH:+:}"$LD_LIBRARY_PATH"
-
         ./tom migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
         ./tom migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
         ./tom migrate:install --database=tinyorm_tom_sqlite --no-ansi

diff --git a/.github/workflows/msvc2019-qt5.yml b/.github/workflows/msvc2019-qt5.yml
@@ -474,11 +474,13 @@ jobs:
       run: |
         ccache.exe --show-stats -vv
 
+    - name: TinyORM add on the $env:Path
+      run: |
+        $env:TinyORMBuildTree >> $env:GITHUB_PATH
+
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: >-
-        $env:Path = '..\..;' + $env:Path
-
         .\tom_testdata.exe migrate
         --database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
         --seed --no-ansi
@@ -523,8 +525,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -545,8 +545,6 @@ jobs:
     - name: Tom example test some commands (PostgreSQL) 🙌
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -567,8 +565,6 @@ jobs:
     - name: Tom example test some commands (SQLite) 🏁
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi

diff --git a/.github/workflows/msvc2022-qt6-drivers.yml b/.github/workflows/msvc2022-qt6-drivers.yml
@@ -256,12 +256,14 @@ jobs:
       run: |
         ccache.exe --show-stats -vv
 
+    - name: TinyORM add on the $env:Path
+      run: |
+        $env:TinyORMBuildTree >> $env:GITHUB_PATH
+
     # Used migrate:fresh instead (is safer)
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom_testdata.exe migrate:fresh --database=tinyorm_testdata_tom_mysql --seed --no-ansi
       env:
         DB_MYSQL_CHARSET: ${{ secrets.DB_MYSQL_CHARSET }}
@@ -298,8 +300,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi

diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml
@@ -727,11 +727,13 @@ jobs:
       run: |
         ccache.exe --show-stats -vv
 
+    - name: TinyORM add on the $env:Path
+      run: |
+        $env:TinyORMBuildTree >> $env:GITHUB_PATH
+
     - name: Create and Seed tables for unit tests 🎉
       working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom
       run: >-
-        $env:Path = '..\..;' + $env:Path
-
         .\tom_testdata.exe migrate
         --database=tinyorm_testdata_tom_mysql,tinyorm_testdata_tom_postgres,tinyorm_testdata_tom_sqlite
         --seed --no-ansi
@@ -784,8 +786,6 @@ jobs:
     - name: Tom example test some commands (MySQL) 🚀
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_mysql --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_mysql --no-ansi
@@ -810,8 +810,6 @@ jobs:
     - name: Tom example test some commands (PostgreSQL) 🙌
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_postgres --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_postgres --no-ansi
@@ -832,8 +830,6 @@ jobs:
     - name: Tom example test some commands (SQLite) 🏁
       working-directory: ${{ env.TinyORMBuildTree }}/examples/tom
       run: |
-        $env:Path = '..\..;' + $env:Path
-
         .\tom.exe migrate:fresh --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:uninstall --reset --database=tinyorm_tom_sqlite --no-ansi
         .\tom.exe migrate:install --database=tinyorm_tom_sqlite --no-ansi