From feda947e890d9b3aaac095accab7a9452162585a Mon Sep 17 00:00:00 2001 From: Thijs Schreijer Date: Sat, 9 Mar 2024 16:21:37 +0100 Subject: [PATCH] more windows, and cleanup --- .github/workflows/build.yml | 54 +++++++++++++------------------------ 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 943a9b8..7825ddd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,27 @@ jobs: luaVersion: "5.4" - os: "windows-latest" luaVersion: "luajit" + # Windows MSVC - os: "windows-latest" toolchain: "msvc" + luaVersion: "5.1" + - os: "windows-latest" + toolchain: "msvc" + luaVersion: "5.2" + - os: "windows-latest" + toolchain: "msvc" + luaVersion: "5.3" + - os: "windows-latest" + toolchain: "msvc" + luaVersion: "5.4" + # Windows MinGW + - os: "windows-latest" + luaVersion: "5.1" + - os: "windows-latest" + luaVersion: "5.2" + - os: "windows-latest" + luaVersion: "5.3" + - os: "windows-latest" luaVersion: "5.4" runs-on: ${{ matrix.os }} @@ -48,30 +67,6 @@ jobs: if: ${{ matrix.toolchain == 'msvc' }} uses: ilammy/msvc-dev-cmd@v1 - - name: install Dependencies analyzer - if: ${{ matrix.toolchain == 'msvc' }} - run: | - $version = "1.11.1" - echo "Installing Dependencies version: $version" - $url = 'https://github.com/lucasg/Dependencies/releases/download/v' + $version + '/Dependencies_x64_Release.zip' - $dest = Join-Path -Path $PWD -ChildPath ".dependencies" - - # Download and extract Dependencies - New-Item -ItemType Directory -Path "$dest" - Invoke-WebRequest -Uri $url -OutFile "$dest\dependencies.zip" - Expand-Archive -Path "$dest\dependencies.zip" -DestinationPath "$dest" - Remove-Item -Path "$dest\dependencies.zip" - # dir "$dest" - - # Add Dependencies to PATH - $env:PATH += ";$dest" - echo $env:PATH - - # Verify Dependencies Installation - dir "$dest\*.exe" - dir ".\.dependencies\Dependencies.exe" - .\.dependencies\Dependencies.exe -help - - uses: hishamhm/gh-actions-lua@master with: luaVersion: ${{ matrix.luaVersion }} @@ -83,17 +78,6 @@ jobs: - name: dependencies run: | luarocks install busted - luarocks config - luarocks show luafilesystem - - - name: check dependencies - if: ${{ matrix.toolchain == 'msvc' }} - run: | - dir C:\Users\runneradmin\AppData\Roaming\luarocks\lib\lua\5.4\lfs.dll - lua -e "print(require'system.core')" - lua -e "print(require'lfs')" - .\.dependencies\Dependencies.exe -json -exports C:\Users\runneradmin\AppData\Roaming\luarocks\lib\lua\5.4\lfs.dll - luarocks make - name: test run: |