From 2400b3ef9cf96bdab9b77f40b354d8f9e4276d2d Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Thu, 18 Jul 2024 10:11:00 +0200 Subject: [PATCH] [CI]: Improve install-premake5/action.yml to install premake in system directory --- .github/actions/install-premake5/action.yml | 22 ++++++++++++------- .github/workflows/premake5-mac-xcode4.yml | 6 ++--- .github/workflows/premake5-qt-mac-xcode4.yml | 11 ++++------ .../workflows/premake5-qt-ubuntu-cmake.yml | 6 ++--- .../premake5-qt-ubuntu-codeblocks.yml | 7 ++---- .../workflows/premake5-qt-ubuntu-codelite.yml | 7 ++---- .../workflows/premake5-qt-ubuntu-gmake.yml | 6 ++--- .../workflows/premake5-qt-ubuntu-gmake2.yml | 6 ++--- .../workflows/premake5-qt-ubuntu-ninja.yml | 7 ++---- .../workflows/premake5-qt-ubuntu-qmake.yml | 6 ++--- .../premake5-qt-windows-msvc-2019.yml | 2 +- .../premake5-qt-windows-msvc-2022.yml | 2 +- .github/workflows/premake5-ubuntu-cmake.yml | 2 +- .../workflows/premake5-ubuntu-codeblocks.yml | 10 +++------ .../workflows/premake5-ubuntu-codelite.yml | 6 ++--- .github/workflows/premake5-ubuntu-gmake.yml | 6 ++--- .github/workflows/premake5-ubuntu-gmake2.yml | 6 ++--- .github/workflows/premake5-ubuntu-ninja.yml | 6 ++--- .github/workflows/premake5-ubuntu-qmake.yml | 6 ++--- .github/workflows/premake5-windows-cmake.yml | 2 +- .github/workflows/premake5-windows-gmake2.yml | 5 +---- .../workflows/premake5-windows-msvc-2019.yml | 4 ++-- .../workflows/premake5-windows-msvc-2022.yml | 4 ++-- .github/workflows/premake5-windows-ninja.yml | 9 +++----- 24 files changed, 65 insertions(+), 89 deletions(-) diff --git a/.github/actions/install-premake5/action.yml b/.github/actions/install-premake5/action.yml index 8c3c42d..24abaa9 100644 --- a/.github/actions/install-premake5/action.yml +++ b/.github/actions/install-premake5/action.yml @@ -23,31 +23,37 @@ runs: with: repository: ${{ inputs.repository }} ref: ${{ inputs.ref }} - path: premake-build + path: .premake-build - name: Build premake5 if: runner.os == 'Linux' run: | - cd premake-build + cd .premake-build make -f Bootstrap.mak linux CONFIG=release - cp bin/release/premake5 ../ + sudo cp bin/release/premake5 /usr/bin/ cd .. - rm -Rf premake-build + rm -Rf .premake-build shell: bash - name: Build premake5 if: runner.os == 'macOS' run: | - cd premake-build + cd .premake-build make -f Bootstrap.mak osx CONFIG=release - cp bin/release/premake5 ../ + mkdir /Applications/premake5.app + cp bin/release/premake5 /Applications/premake5.app/ cd .. - rm -Rf premake-build + rm -Rf .premake-build + echo PATH=$PATH:/Applications/premake5.app/ >> $GITHUB_ENV + echo /Applications/premake5.app/ >> GITHUB_PATH shell: bash - name: Build premake5 if: runner.os == 'Windows' # 2019 or 2022 run: | + mkdir "C:\Program Files\premake" $vcvarall_path = vswhere -find VC\Auxiliary\Build\vcvarsall.bat - cmd.exe /c "call ""$vcvarall_path"" x86_amd64 && cd premake-build && nmake -f Bootstrap.mak MSDEV=${{ inputs.msdev }} windows-msbuild PLATFORM=Win32 CONFIG=release && cp bin/release/premake5.exe ../" + cmd.exe /c "call ""$vcvarall_path"" x86_amd64 && cd .premake-build && nmake -f Bootstrap.mak MSDEV=${{ inputs.msdev }} windows-msbuild PLATFORM=Win32 CONFIG=release && cp bin/release/premake5.exe ""c:/Program Files/premake""" + Remove-Item .premake-build -Recurse -Force + echo "C:\Program Files\premake" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append shell: powershell diff --git a/.github/workflows/premake5-mac-xcode4.yml b/.github/workflows/premake5-mac-xcode4.yml index d2f388b..bd09450 100644 --- a/.github/workflows/premake5-mac-xcode4.yml +++ b/.github/workflows/premake5-mac-xcode4.yml @@ -40,10 +40,10 @@ jobs: repository: premake/premake-core - name: test projects default(clang) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects xcode4 + run: python3 ./test_projects.py premake5 projects xcode4 - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects xcode4 --cc=gcc + run: python3 ./test_projects.py premake5 projects xcode4 --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects xcode4 --cc=clang + run: python3 ./test_projects.py premake5 projects xcode4 --cc=clang diff --git a/.github/workflows/premake5-qt-mac-xcode4.yml b/.github/workflows/premake5-qt-mac-xcode4.yml index 24adce1..007ea21 100644 --- a/.github/workflows/premake5-qt-mac-xcode4.yml +++ b/.github/workflows/premake5-qt-mac-xcode4.yml @@ -53,13 +53,10 @@ jobs: cache: true cache-key-prefix: 'qt-action@4-Qt${{matrix.qt-version}}_macos' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV - find $QT_ROOT_DIR -name "*moc*" #- name: install libxkbcommon-x11-0 # display dependency # run: sudo apt-get install libxkbcommon-x11-0 @@ -67,14 +64,14 @@ jobs: - name: test projects default(clang) run: | # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value - python3 ./test_projects.py premake5 projects-qt xcode4 --qt-version=${{ matrix.qt-version }} + python3 ./test_projects.py premake5 projects-qt xcode4 --scripts=`pwd` --qt-version=${{ matrix.qt-version }} - name: test projects gcc run: | # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value - python3 ./test_projects.py premake5 projects-qt xcode4 --qt-version=${{ matrix.qt-version }} --cc=gcc + python3 ./test_projects.py premake5 projects-qt xcode4 --scripts=`pwd` --qt-version=${{ matrix.qt-version }} --cc=gcc - name: test projects clang run: | # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value - python3 ./test_projects.py premake5 projects-qt xcode4 --qt-version=${{ matrix.qt-version }} --cc=clang + python3 ./test_projects.py premake5 projects-qt xcode4 --scripts=`pwd` --qt-version=${{ matrix.qt-version }} --cc=clang diff --git a/.github/workflows/premake5-qt-ubuntu-cmake.yml b/.github/workflows/premake5-qt-ubuntu-cmake.yml index 70fca18..44dfbdc 100644 --- a/.github/workflows/premake5-qt-ubuntu-cmake.yml +++ b/.github/workflows/premake5-qt-ubuntu-cmake.yml @@ -62,10 +62,8 @@ jobs: cache: true cache-key-prefix: 'qt-action@v4-Qt${{matrix.qt-version}}_ubuntu' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV #--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 @@ -77,4 +75,4 @@ jobs: timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value - xvfb-run -a python3 ./test_projects.py premake5 projects-qt cmake --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt cmake --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-codeblocks.yml b/.github/workflows/premake5-qt-ubuntu-codeblocks.yml index 7f6a268..8baa7ec 100644 --- a/.github/workflows/premake5-qt-ubuntu-codeblocks.yml +++ b/.github/workflows/premake5-qt-ubuntu-codeblocks.yml @@ -72,11 +72,8 @@ jobs: mkdir -p ~/.config/codeblocks cp codeblocks/default.conf ~/.config/codeblocks/ - - name: set path + - name: set environment variable run: | - echo `pwd` >> $GITHUB_PATH - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV @@ -88,4 +85,4 @@ jobs: run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value #--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 - xvfb-run -a python3 ./test_projects.py premake5 projects-qt codeblocks --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt codeblocks --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-codelite.yml b/.github/workflows/premake5-qt-ubuntu-codelite.yml index 843154b..224b37b 100644 --- a/.github/workflows/premake5-qt-ubuntu-codelite.yml +++ b/.github/workflows/premake5-qt-ubuntu-codelite.yml @@ -66,10 +66,8 @@ jobs: cache: true cache-key-prefix: 'qt-action@v4-Qt${{matrix.qt-version}}_ubuntu' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV @@ -81,5 +79,4 @@ jobs: run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value # --qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 - xvfb-run -a python3 ./test_projects.py premake5 projects-qt codelite --qt-version=${{ matrix.qt-version }} - + xvfb-run -a python3 ./test_projects.py premake5 projects-qt codelite --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-gmake.yml b/.github/workflows/premake5-qt-ubuntu-gmake.yml index a7a4ee6..b16a4cf 100644 --- a/.github/workflows/premake5-qt-ubuntu-gmake.yml +++ b/.github/workflows/premake5-qt-ubuntu-gmake.yml @@ -56,10 +56,8 @@ jobs: cache: true cache-key-prefix: 'qt-action@v4-Qt${{matrix.qt-version}}_ubuntu' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV @@ -71,4 +69,4 @@ jobs: run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value #--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 - xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-gmake2.yml b/.github/workflows/premake5-qt-ubuntu-gmake2.yml index 3168322..4c36171 100644 --- a/.github/workflows/premake5-qt-ubuntu-gmake2.yml +++ b/.github/workflows/premake5-qt-ubuntu-gmake2.yml @@ -56,10 +56,8 @@ jobs: cache: true cache-key-prefix: 'qt-action@v4-${{matrix.qt-version}}_ubuntu' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV @@ -71,4 +69,4 @@ jobs: run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value #--qt-root=/home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 - xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake2 --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt gmake2 --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-ninja.yml b/.github/workflows/premake5-qt-ubuntu-ninja.yml index 74e36a5..188e81e 100644 --- a/.github/workflows/premake5-qt-ubuntu-ninja.yml +++ b/.github/workflows/premake5-qt-ubuntu-ninja.yml @@ -70,13 +70,10 @@ jobs: cache: true cache-key-prefix: 'qt-action@v4-Qt${{matrix.qt-version}}_ubuntu' - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV - ls $QT_ROOT_DIR/bin # /home/runner/work/premake-sample-projects/Qt/5.15.0/gcc_64 - name: install libxkbcommon-x11-0 # display dependency @@ -86,4 +83,4 @@ jobs: timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as Qt widget requires displays :/ # Cannot use environment variable ($QT_ROOT_DIR ) in command line, so use environment variable (QT_DIR) or its hardcoded value - xvfb-run -a python3 ./test_projects.py premake5 projects-qt ninja --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt ninja --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-ubuntu-qmake.yml b/.github/workflows/premake5-qt-ubuntu-qmake.yml index 0759e33..d33bbdf 100644 --- a/.github/workflows/premake5-qt-ubuntu-qmake.yml +++ b/.github/workflows/premake5-qt-ubuntu-qmake.yml @@ -62,10 +62,8 @@ jobs: - name: test qmake run: qmake --version - - name: set path + - name: set environment variable run: | - echo PATH=$PATH:`pwd` - echo PATH=$PATH:`pwd` >> $GITHUB_ENV echo QT_DIR=$QT_ROOT_DIR echo QT_DIR=$QT_ROOT_DIR >> $GITHUB_ENV @@ -75,4 +73,4 @@ jobs: - name: test projects default(gcc) timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as Qt widget requires displays :/ - xvfb-run -a python3 ./test_projects.py premake5 projects-qt qmake --qt-version=${{ matrix.qt-version }} + xvfb-run -a python3 ./test_projects.py premake5 projects-qt qmake --scripts=`pwd` --qt-version=${{ matrix.qt-version }} diff --git a/.github/workflows/premake5-qt-windows-msvc-2019.yml b/.github/workflows/premake5-qt-windows-msvc-2019.yml index ad43ea0..4359dc9 100644 --- a/.github/workflows/premake5-qt-windows-msvc-2019.yml +++ b/.github/workflows/premake5-qt-windows-msvc-2019.yml @@ -60,5 +60,5 @@ jobs: - name: test projects run: | - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects-qt vs2019 --qt-root=$QT_ROOT_DIR --qt-version=${{ matrix.qt-version }} + python3 ./test_projects.py premake5 projects-qt vs2019 --scripts=`pwd` --qt-root=$QT_ROOT_DIR --qt-version=${{ matrix.qt-version }} shell: bash diff --git a/.github/workflows/premake5-qt-windows-msvc-2022.yml b/.github/workflows/premake5-qt-windows-msvc-2022.yml index 5f60ae2..7e9bbb2 100644 --- a/.github/workflows/premake5-qt-windows-msvc-2022.yml +++ b/.github/workflows/premake5-qt-windows-msvc-2022.yml @@ -59,5 +59,5 @@ jobs: - name: test projects run: | - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects-qt vs2022 --qt-root=$QT_ROOT_DIR --qt-version=${{ matrix.qt-version }} + python3 ./test_projects.py premake5 projects-qt vs2022 --scripts=`pwd` --qt-root=$QT_ROOT_DIR --qt-version=${{ matrix.qt-version }} shell: bash diff --git a/.github/workflows/premake5-ubuntu-cmake.yml b/.github/workflows/premake5-ubuntu-cmake.yml index daadbab..96fdfa6 100644 --- a/.github/workflows/premake5-ubuntu-cmake.yml +++ b/.github/workflows/premake5-ubuntu-cmake.yml @@ -49,4 +49,4 @@ jobs: echo "require 'submodules/premake-cmake/cmake'" >> premake-system.lua - name: test projects - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects cmake + run: python3 ./test_projects.py premake5 projects cmake --scripts=`pwd` diff --git a/.github/workflows/premake5-ubuntu-codeblocks.yml b/.github/workflows/premake5-ubuntu-codeblocks.yml index 7a55336..1290b92 100644 --- a/.github/workflows/premake5-ubuntu-codeblocks.yml +++ b/.github/workflows/premake5-ubuntu-codeblocks.yml @@ -58,21 +58,17 @@ jobs: mkdir -p ~/.config/codeblocks cp codeblocks/default.conf ~/.config/codeblocks/ - - name: Set path - run: | - echo `pwd` >> $GITHUB_PATH - - name: test projects default(gcc) timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as codeblocks requires displays :/ - xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks + xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks --scripts=`pwd` - name: test projects gcc timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as codeblocks requires displays :/ - xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks --cc=gcc + xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks --scripts=`pwd` --cc=gcc - name: test projects clang timeout-minutes: 5 # tends to not stop properly in case of failure run: | # fake X-server as codeblocks requires displays :/ - xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks --cc=clang + xvfb-run -a python3 ./test_projects.py premake5 projects codeblocks --scripts=`pwd` --cc=clang diff --git a/.github/workflows/premake5-ubuntu-codelite.yml b/.github/workflows/premake5-ubuntu-codelite.yml index cbd79f4..e060328 100644 --- a/.github/workflows/premake5-ubuntu-codelite.yml +++ b/.github/workflows/premake5-ubuntu-codelite.yml @@ -49,10 +49,10 @@ jobs: run: xvfb-run -a codelite --version || exit 0 # codelite --version returns -1 - name: test projects default(clang) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects codelite + run: python3 ./test_projects.py premake5 projects codelite - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects codelite --cc=gcc + run: python3 ./test_projects.py premake5 projects codelite --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects codelite --cc=clang + run: python3 ./test_projects.py premake5 projects codelite --cc=clang diff --git a/.github/workflows/premake5-ubuntu-gmake.yml b/.github/workflows/premake5-ubuntu-gmake.yml index 01777b4..1e49a6e 100644 --- a/.github/workflows/premake5-ubuntu-gmake.yml +++ b/.github/workflows/premake5-ubuntu-gmake.yml @@ -41,10 +41,10 @@ jobs: run: make --version - name: test projects default(gcc) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake + run: python3 ./test_projects.py premake5 projects gmake - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake --cc=gcc + run: python3 ./test_projects.py premake5 projects gmake --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake --cc=clang + run: python3 ./test_projects.py premake5 projects gmake --cc=clang diff --git a/.github/workflows/premake5-ubuntu-gmake2.yml b/.github/workflows/premake5-ubuntu-gmake2.yml index e655ec3..b8adbd0 100644 --- a/.github/workflows/premake5-ubuntu-gmake2.yml +++ b/.github/workflows/premake5-ubuntu-gmake2.yml @@ -41,10 +41,10 @@ jobs: run: make --version - name: test projects default(gcc) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake2 + run: python3 ./test_projects.py premake5 projects gmake2 - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake2 --cc=gcc + run: python3 ./test_projects.py premake5 projects gmake2 --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake2 --cc=clang + run: python3 ./test_projects.py premake5 projects gmake2 --cc=clang diff --git a/.github/workflows/premake5-ubuntu-ninja.yml b/.github/workflows/premake5-ubuntu-ninja.yml index ec4085a..ff7d309 100644 --- a/.github/workflows/premake5-ubuntu-ninja.yml +++ b/.github/workflows/premake5-ubuntu-ninja.yml @@ -56,10 +56,10 @@ jobs: echo "require 'submodules/premake-ninja/ninja'" >> premake-system.lua - name: test projects default(gcc) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja + run: python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja --cc=gcc + run: python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja --cc=clang + run: python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` --cc=clang diff --git a/.github/workflows/premake5-ubuntu-qmake.yml b/.github/workflows/premake5-ubuntu-qmake.yml index 6fd505c..f8d64e4 100644 --- a/.github/workflows/premake5-ubuntu-qmake.yml +++ b/.github/workflows/premake5-ubuntu-qmake.yml @@ -56,10 +56,10 @@ jobs: run: qmake --version - name: test projects default(gcc) - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects qmake + run: python3 ./test_projects.py premake5 projects qmake --scripts=`pwd` - name: test projects gcc - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects qmake --cc=gcc + run: python3 ./test_projects.py premake5 projects qmake --scripts=`pwd` --cc=gcc - name: test projects clang - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects qmake --cc=clang + run: python3 ./test_projects.py premake5 projects qmake --scripts=`pwd` --cc=clang diff --git a/.github/workflows/premake5-windows-cmake.yml b/.github/workflows/premake5-windows-cmake.yml index 5d2f27e..8089842 100644 --- a/.github/workflows/premake5-windows-cmake.yml +++ b/.github/workflows/premake5-windows-cmake.yml @@ -55,5 +55,5 @@ jobs: echo "require 'submodules/premake-cmake/cmake'" >> premake-system.lua - name: test projects - run: PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects cmake --shell=posix + run: python3 ./test_projects.py premake5 projects cmake --scripts=`pwd` --shell=posix shell: bash diff --git a/.github/workflows/premake5-windows-gmake2.yml b/.github/workflows/premake5-windows-gmake2.yml index e38b492..15fd552 100644 --- a/.github/workflows/premake5-windows-gmake2.yml +++ b/.github/workflows/premake5-windows-gmake2.yml @@ -48,13 +48,10 @@ jobs: - name: test projects run: | - echo $PATH - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects gmake2 --shell=posix + python3 ./test_projects.py premake5 projects gmake2 --shell=posix shell: bash # - name: test projects # run: | -# echo %PATH% -# set PATH=%PATH%;`pwd` # python3 ./test_projects.py premake5 projects gmake2 # shell: cmd diff --git a/.github/workflows/premake5-windows-msvc-2019.yml b/.github/workflows/premake5-windows-msvc-2019.yml index b32b9ad..779339b 100644 --- a/.github/workflows/premake5-windows-msvc-2019.yml +++ b/.github/workflows/premake5-windows-msvc-2019.yml @@ -44,10 +44,10 @@ jobs: - name: test projects (default=msc) run: | #"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects vs2019 + python3 ./test_projects.py premake5 projects vs2019 shell: bash - name: test projects (clang) run: | - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects vs2019 --cc=clang + python3 ./test_projects.py premake5 projects vs2019 --cc=clang shell: bash diff --git a/.github/workflows/premake5-windows-msvc-2022.yml b/.github/workflows/premake5-windows-msvc-2022.yml index 0f1b47b..069e525 100644 --- a/.github/workflows/premake5-windows-msvc-2022.yml +++ b/.github/workflows/premake5-windows-msvc-2022.yml @@ -43,10 +43,10 @@ jobs: - name: test projects (default=msc) run: | #"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects vs2022 + python3 ./test_projects.py premake5 projects vs2022 shell: bash - name: test projects (clang) run: | - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects vs2022 --cc=clang + python3 ./test_projects.py premake5 projects vs2022 --cc=clang shell: bash diff --git a/.github/workflows/premake5-windows-ninja.yml b/.github/workflows/premake5-windows-ninja.yml index 0702162..56705fc 100644 --- a/.github/workflows/premake5-windows-ninja.yml +++ b/.github/workflows/premake5-windows-ninja.yml @@ -62,19 +62,16 @@ jobs: # - name: test projects default(msc-v142) # Visual Studio 2019 (version mismatch is not that important, only cl.exe is called) # run: | # #"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 -# echo $PATH -# PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja--shell=posix +# python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` --shell=posix # shell: bash - name: test projects msc-v143 # Visual Studio 2022 run: | #"C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - echo $PATH - PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja --cc=msc-v143 --shell=posix + python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` --cc=msc-v143 --shell=posix shell: bash # - name: test projects gcc # run: | -# echo $PATH -# PATH=$PATH:`pwd` python3 ./test_projects.py premake5 projects ninja --cc=gcc --shell=posix +# python3 ./test_projects.py premake5 projects ninja --scripts=`pwd` --cc=gcc --shell=posix # shell: bash