From c9944d23ccd5abc73adfd761eea7467decb4ce0b Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 20 Jan 2024 09:06:21 -0800 Subject: [PATCH 1/5] initial pass over builds.yml for auto-running build permutations --- .github/workflows/builds.yml | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/builds.yml diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml new file mode 100644 index 00000000..a7d5e296 --- /dev/null +++ b/.github/workflows/builds.yml @@ -0,0 +1,40 @@ +name: builds + +on: [push, pull_request] + +jobs: + build-windows: + runs-on: windows-2022 + steps: + - name: checkout + uses: actions/checkout@v2 + - name: build (vs 2022) + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + build raddbg msvc debug + build raddbg_from_pdb msvc debug + build raddbg_from_dwarf msvc debug + build raddbg clang debug + build raddbg_from_pdb clang debug + build raddbg_from_dwarf clang debug + - name: build (vs 2019) + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + build raddbg msvc debug + build raddbg_from_pdb msvc debug + build raddbg_from_dwarf msvc debug + build raddbg clang debug + build raddbg_from_pdb clang debug + build raddbg_from_dwarf clang debug + - name: build (vs 2017) + shell: cmd + run: | + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + build raddbg msvc debug + build raddbg_from_pdb msvc debug + build raddbg_from_dwarf msvc debug + build raddbg clang debug + build raddbg_from_pdb clang debug + build raddbg_from_dwarf clang debug From d172b3a059af35937b9cd7be5d73ceb35084c591 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 20 Jan 2024 09:10:11 -0800 Subject: [PATCH 2/5] attempt to fix vcvarsall.bat paths in github actions workflow --- .github/workflows/builds.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a7d5e296..4c871098 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -11,7 +11,7 @@ jobs: - name: build (vs 2022) shell: cmd run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 build raddbg msvc debug build raddbg_from_pdb msvc debug build raddbg_from_dwarf msvc debug @@ -21,7 +21,7 @@ jobs: - name: build (vs 2019) shell: cmd run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 build raddbg msvc debug build raddbg_from_pdb msvc debug build raddbg_from_dwarf msvc debug @@ -31,7 +31,7 @@ jobs: - name: build (vs 2017) shell: cmd run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 build raddbg msvc debug build raddbg_from_pdb msvc debug build raddbg_from_dwarf msvc debug From 014074e3ce566272fad4504d5684363fe565744f Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 20 Jan 2024 11:59:46 -0800 Subject: [PATCH 3/5] i am once again asking my GitHub actions script to call vcvarsall.bat correctly --- .github/workflows/builds.yml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 4c871098..39890c02 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -3,7 +3,7 @@ name: builds on: [push, pull_request] jobs: - build-windows: + build-windows-2022: runs-on: windows-2022 steps: - name: checkout @@ -11,27 +11,7 @@ jobs: - name: build (vs 2022) shell: cmd run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 - build raddbg msvc debug - build raddbg_from_pdb msvc debug - build raddbg_from_dwarf msvc debug - build raddbg clang debug - build raddbg_from_pdb clang debug - build raddbg_from_dwarf clang debug - - name: build (vs 2019) - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 - build raddbg msvc debug - build raddbg_from_pdb msvc debug - build raddbg_from_dwarf msvc debug - build raddbg clang debug - build raddbg_from_pdb clang debug - build raddbg_from_dwarf clang debug - - name: build (vs 2017) - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 + call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 build raddbg msvc debug build raddbg_from_pdb msvc debug build raddbg_from_dwarf msvc debug From b283225d03a0cb6c7159c624c0fac2c1cc38e2e2 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 20 Jan 2024 12:04:41 -0800 Subject: [PATCH 4/5] exit paths for build.bat --- build.bat | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build.bat b/build.bat index 8521437b..6809c165 100644 --- a/build.bat +++ b/build.bat @@ -81,23 +81,23 @@ if not exist local mkdir local if "%no_meta%"=="1" echo [skipping metagen] if not "%no_meta%"=="1" ( pushd build - %compile_debug% ..\src\metagen\metagen_main.c %compile_link% %out%metagen.exe - metagen.exe + %compile_debug% ..\src\metagen\metagen_main.c %compile_link% %out%metagen.exe || exit /b 1 + metagen.exe || exit /b 1 popd ) :: --- Build Everything (@build_targets) -------------------------------------- pushd build -if "%raddbg%"=="1" %compile% %gfx% ..\src\raddbg\raddbg_main.cpp %compile_link% %out%raddbg.exe -if "%raddbg_from_pdb%"=="1" %compile% ..\src\raddbg_convert\pdb\raddbg_from_pdb_main.c %compile_link% %out%raddbg_from_pdb.exe -if "%raddbg_from_dwarf%"=="1" %compile% ..\src\raddbg_convert\dwarf\raddbg_from_dwarf.c %compile_link% %out%raddbg_from_dwarf.exe -if "%raddbg_dump%"=="1" %compile% ..\src\raddbg_dump\raddbg_dump.c %compile_link% %out%raddbg_dump.exe -if "%ryan_scratch%"=="1" %compile% ..\src\scratch\ryan_scratch.c %compile_link% %out%ryan_scratch.exe -if "%cpp_tests%"=="1" %compile% ..\src\scratch\i_hate_c_plus_plus.cpp %compile_link% %out%cpp_tests.exe -if "%look_at_raddbg%"=="1" %compile% ..\src\scratch\look_at_raddbg.c %compile_link% %out%look_at_raddbg.exe -if "%mule_main%"=="1" del vc*.pdb mule*.pdb && %compile_release% %only_compile% ..\src\mule\mule_inline.cpp && %compile_release% %only_compile% ..\src\mule\mule_o2.cpp && %compile_debug% %EHsc% ..\src\mule\mule_main.cpp ..\src\mule\mule_c.c mule_inline.obj mule_o2.obj -if "%mule_module%"=="1" %compile% ..\src\mule\mule_module.cpp %compile_link% %link_dll% %out%mule_module.dll -if "%mule_hotload%"=="1" %compile% ..\src\mule\mule_hotload_main.c %compile_link% %out%mule_hotload.exe & %compile% ..\src\mule\mule_hotload_module_main.c %compile_link% %link_dll% %out%mule_hotload_module.dll +if "%raddbg%"=="1" %compile% %gfx% ..\src\raddbg\raddbg_main.cpp %compile_link% %out%raddbg.exe || exit /b 1 +if "%raddbg_from_pdb%"=="1" %compile% ..\src\raddbg_convert\pdb\raddbg_from_pdb_main.c %compile_link% %out%raddbg_from_pdb.exe || exit /b 1 +if "%raddbg_from_dwarf%"=="1" %compile% ..\src\raddbg_convert\dwarf\raddbg_from_dwarf.c %compile_link% %out%raddbg_from_dwarf.exe || exit /b 1 +if "%raddbg_dump%"=="1" %compile% ..\src\raddbg_dump\raddbg_dump.c %compile_link% %out%raddbg_dump.exe || exit /b 1 +if "%ryan_scratch%"=="1" %compile% ..\src\scratch\ryan_scratch.c %compile_link% %out%ryan_scratch.exe || exit /b 1 +if "%cpp_tests%"=="1" %compile% ..\src\scratch\i_hate_c_plus_plus.cpp %compile_link% %out%cpp_tests.exe || exit /b 1 +if "%look_at_raddbg%"=="1" %compile% ..\src\scratch\look_at_raddbg.c %compile_link% %out%look_at_raddbg.exe || exit /b 1 +if "%mule_main%"=="1" del vc*.pdb mule*.pdb && %compile_release% %only_compile% ..\src\mule\mule_inline.cpp && %compile_release% %only_compile% ..\src\mule\mule_o2.cpp && %compile_debug% %EHsc% ..\src\mule\mule_main.cpp ..\src\mule\mule_c.c mule_inline.obj mule_o2.obj || exit /b 1 +if "%mule_module%"=="1" %compile% ..\src\mule\mule_module.cpp %compile_link% %link_dll% %out%mule_module.dll || exit /b 1 +if "%mule_hotload%"=="1" %compile% ..\src\mule\mule_hotload_main.c %compile_link% %out%mule_hotload.exe & %compile% ..\src\mule\mule_hotload_module_main.c %compile_link% %link_dll% %out%mule_hotload_module.dll || exit /b 1 popd :: --- Unset ------------------------------------------------------------------ From dc108d72c1cd253cdbca38423778aa94402569ee Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Sat, 20 Jan 2024 12:06:21 -0800 Subject: [PATCH 5/5] Update builds.yml --- .github/workflows/builds.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 39890c02..18f7172c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -12,9 +12,9 @@ jobs: shell: cmd run: | call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 - build raddbg msvc debug - build raddbg_from_pdb msvc debug - build raddbg_from_dwarf msvc debug - build raddbg clang debug - build raddbg_from_pdb clang debug - build raddbg_from_dwarf clang debug + call build raddbg msvc debug + call build raddbg_from_pdb msvc debug + call build raddbg_from_dwarf msvc debug + call build raddbg clang debug + call build raddbg_from_pdb clang debug + call build raddbg_from_dwarf clang debug