From 2157ca0abee90a33f07126e18cf04f53e352b6c5 Mon Sep 17 00:00:00 2001 From: ell <77150506+ellraiser@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:17:30 +0000 Subject: [PATCH] bump workflow vers --- .github/workflows/main.yml | 6 +++--- tests/filesystem.lua | 8 +++++--- tests/graphics.lua | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4098dd4..fef767d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: uses: actions/checkout@v4 - name: Download Love run: | - curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1273249143/zip" + curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1281048251/zip" 7z x love12.zip -o* 7z x love12/love-macos.zip -o* - name: Run Test Suite @@ -50,7 +50,7 @@ jobs: powershell.exe mesa\systemwidedeploy.cmd 1 - name: Download Love run: | - curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1273247540/zip" + curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1281052019/zip" 7z x love12.zip -o* 7z x love12/love-12.0-win64.zip -o* - name: Run Tests (opengl) @@ -146,7 +146,7 @@ jobs: uses: actions/checkout@v4 - name: Download Love run: | - curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1273246871/zip" + curl -L -H "Accept: application/vnd.github+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --output love12.zip --url "https://api.github.com/repos/love2d/love/actions/artifacts/1281052506/zip" 7z x love12.zip -o* mv love12/love-*.AppImage love12/love12.AppImage ls love12 diff --git a/tests/filesystem.lua b/tests/filesystem.lua index 40c23a8..63a8d0a 100644 --- a/tests/filesystem.lua +++ b/tests/filesystem.lua @@ -392,15 +392,17 @@ love.test.filesystem.mountCommonPath = function(test) local mount2 = love.filesystem.mountCommonPath('appdocuments', 'appdocuments', 'readwrite') local mount3 = love.filesystem.mountCommonPath('userhome', 'userhome', 'readwrite') local mount4 = love.filesystem.mountCommonPath('userappdata', 'userappdata', 'readwrite') - -- need to check mount5+mount6 on linux, mount5 fails - local mount5 = love.filesystem.mountCommonPath('userdesktop', 'userdesktop', 'readwrite') + -- userdesktop isnt valid on linux + if love.system.getOS() ~= 'Linux' then + local mount5 = love.filesystem.mountCommonPath('userdesktop', 'userdesktop', 'readwrite') + test:assertTrue(mount5, 'check mount userdesktop') + end local mount6 = love.filesystem.mountCommonPath('userdocuments', 'userdocuments', 'readwrite') local ok = pcall(love.filesystem.mountCommonPath, 'fakepath', 'fake', 'readwrite') test:assertTrue(mount1, 'check mount appsavedir') test:assertTrue(mount2, 'check mount appdocuments') test:assertTrue(mount3, 'check mount userhome') test:assertTrue(mount4, 'check mount userappdata') - test:assertTrue(mount5, 'check mount userdesktop') test:assertTrue(mount6, 'check mount userdocuments') test:assertFalse(ok, 'check mount invalid common path fails') end diff --git a/tests/graphics.lua b/tests/graphics.lua index d4822f9..071ad1d 100644 --- a/tests/graphics.lua +++ b/tests/graphics.lua @@ -219,7 +219,7 @@ love.test.graphics.Canvas = function(test) test:assertEquals('equal', dcanvas:getDepthSampleMode(), 'check depth sample mode set') -- check compute writeable (wont work on opengl mac) - if love.graphics.getSupported()['glsl4'] then + if love.graphics.getSupported().glsl4 then local ccanvas = love.graphics.newCanvas(100, 100, { type = '2d', format = 'r32f',