From a60a8600538af1391510d38788aab8e681d03c2b Mon Sep 17 00:00:00 2001 From: Super Genius Date: Wed, 27 Sep 2023 12:09:07 -0700 Subject: [PATCH] fixes types and missed yml files to update the location of genie --- .github/workflows/build.yml | 8 ++++---- .github/workflows/codeql.yml | 2 +- .github/workflows/deploy.yml | 4 ++-- projects/main.bat | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d5cc46dc..fec358af6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: pushd ..\plugins git.exe clone https://github.com/nem0/lumixengine_dx11.git dx11 popd - ./genie.exe vs2022 + ./bin/windows/genie.exe vs2022 - name: build dx11 engine working-directory: projects shell: cmd @@ -25,7 +25,7 @@ jobs: run: | pushd ..\plugins popd - ./genie.exe --dx12 vs2022 + ./bin/windows/genie.exe --dx12 vs2022 - name: build dx12 engine working-directory: projects shell: cmd @@ -70,7 +70,7 @@ jobs: - name: make gl project with plugins working-directory: projects run: | - ./genie.exe --nodx --with-app vs2022 + ./bin/windows/genie.exe --nodx --with-app vs2022 - name: build gl engine with plugins working-directory: projects shell: cmd @@ -107,6 +107,6 @@ jobs: - name: build run: | cd projects - ./genie --force-build-luau gmake + ./bin/linux/genie --force-build-luau gmake cd tmp/gmake make -j diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 671b6bb46..abf4e0899 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -50,7 +50,7 @@ jobs: - name: Create solution working-directory: projects - run: ./genie.exe vs2019 + run: ./bin/windows/genie.exe vs2019 # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually (see below) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6ef5be737..0b0fa43ae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,7 +54,7 @@ jobs: - name: make dx11 project working-directory: projects run: | - ./genie.exe --force-build-physx --force-build-luau --with-app vs2022 + ./bin/windows/genie.exe --force-build-physx --force-build-luau --with-app vs2022 - name: get butler working-directory: projects @@ -87,7 +87,7 @@ jobs: - name: make gl project with plugins working-directory: projects run: | - ./genie.exe --force-build-physx --force-build-luau --nodx --with-app vs2022 + ./bin/windows/genie.exe --force-build-physx --force-build-luau --nodx --with-app vs2022 - name: build gl engine working-directory: projects diff --git a/projects/main.bat b/projects/main.bat index 52ed3639f..82ce24e42 100644 --- a/projects/main.bat +++ b/projects/main.bat @@ -499,7 +499,7 @@ exit /B 0 :create_project echo Creating project... - ,\bin\windows\genie.exe --with-app vs2022 + .\bin\windows\genie.exe --with-app vs2022 pause exit /B 0