From b7d5ea54fbfaf2e5813e26ff8117110e58cb2380 Mon Sep 17 00:00:00 2001 From: salix5 Date: Thu, 12 Dec 2024 02:07:59 +0800 Subject: [PATCH 1/3] save lua in /temp/ --- .github/workflows/build.yml | 13 ++++++------- .gitignore | 9 +++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8f3bc74b..6d21717a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,17 +18,16 @@ jobs: - name: Install lua run: | - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://www.lua.org/ftp/lua-5.4.7.tar.gz ; exit 0" - tar xzf lua-5.4.7.tar.gz + bash -c "curl -Z --retry 5 --connect-timeout 30 --location --create-dirs --output-dir temp --remote-name-all https://www.lua.org/ftp/lua-5.4.7.tar.gz https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip ; exit 0" + tar -xzf temp/lua-5.4.7.tar.gz move lua-5.4.7 lua - name: Premake run: | - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/premake/premake-core/releases/download/v5.0.0-beta2/premake-5.0.0-beta2-windows.zip ; exit 0" - 7z x premake-5.0.0-beta2-windows.zip - move premake\lua.lua lua\premake5.lua - move premake\dll.lua dll.lua - .\premake5.exe vs2022 --file=dll.lua + 7z x temp/premake-5.0.0-beta2-windows.zip -opremake5 + move premake/lua.lua lua/premake5.lua + move premake/dll.lua dll.lua + ./premake5/premake5.exe vs2022 --file=dll.lua - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 diff --git a/.gitignore b/.gitignore index 6e2b7b661..2fc9650a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -.vscode/ -/premake5.exe -/build -/lua +/.vscode/ +/premake5* +/build/ +/lua/ +/temp/ From 427c5634889d5cf036e6db4eeb0fb37adfb9f776 Mon Sep 17 00:00:00 2001 From: salix5 Date: Thu, 12 Dec 2024 02:26:51 +0800 Subject: [PATCH 2/3] update directive name --- .github/workflows/build.yml | 4 ++-- .gitignore | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d21717a0..ca36de2fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,10 @@ jobs: - name: Premake run: | - 7z x temp/premake-5.0.0-beta2-windows.zip -opremake5 + 7z x temp/premake-5.0.0-beta2-windows.zip -opremake-5 move premake/lua.lua lua/premake5.lua move premake/dll.lua dll.lua - ./premake5/premake5.exe vs2022 --file=dll.lua + ./premake-5/premake5.exe vs2022 --file=dll.lua - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 diff --git a/.gitignore b/.gitignore index 2fc9650a5..35cf24564 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /.vscode/ -/premake5* /build/ /lua/ /temp/ +/premake-5 +/premake5.exe From 0a7e4c62e7b00548b392945525ba9ffd6b447280 Mon Sep 17 00:00:00 2001 From: salix5 Date: Thu, 12 Dec 2024 02:28:19 +0800 Subject: [PATCH 3/3] typos --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 35cf24564..b790f8658 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ /build/ /lua/ /temp/ -/premake-5 +/premake-5/ /premake5.exe