Skip to content

Commit

Permalink
Merge pull request #428 from jmalak/workflow-cleanup-3
Browse files Browse the repository at this point in the history
consolidate Open Watcom workflow code
  • Loading branch information
davidrg authored Dec 19, 2024
2 parents 9055cca + e5b707e commit 5003642
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 236 deletions.
12 changes: 8 additions & 4 deletions .github/actions/load-vs2003/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ inputs:
runs:
using: composite
steps:
# We need this only to get cvtres.exe which didn't come with either the
# Visual C++ 2003 Toolkit or the Windows Server 2003 SP1 Platform SDK.
- name: Enable Developer Command Prompt
# You may pin to the exact commit or the version.
# uses: ilammy/msvc-dev-cmd@d8610e2b41c6d0f0c3b4c46dad8df0fd826c68e1
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x86
- name: Load Cache VS2003
if: inputs.nocache != 'true'
uses: actions/cache@v4
Expand All @@ -38,12 +46,8 @@ runs:
shell: bash
- name: Setup build MSVC compiler Environment
run: |
rem add build MSVC compiler on the beginning of PATH
rem we need cvtres.exe from current MSVC compiler only
if "${{inputs.arch}}" == "x86" echo ${{github.workspace}}\vs2003\bin>> "%GITHUB_PATH%"
if "${{inputs.arch}}" == "ia64" echo ${{github.workspace}}\vs2003\bin\win64;${{github.workspace}}\vs2003\bin>> "%GITHUB_PATH%"
rem Don't want to pick up headers or libraries from current MSVC compiler
rem we override INCLUDE and LIB environment variables to point to build MSVC compiler
echo INCLUDE=${{github.workspace}}\vs2003\include>> "%GITHUB_ENV%"
if "${{inputs.arch}}" == "x86" echo LIB=${{github.workspace}}\vs2003\lib;%LIB%>> "%GITHUB_ENV%"
if "${{inputs.arch}}" == "ia64" echo LIB=${{github.workspace}}\vs2003\lib\ia64>> "%GITHUB_ENV%"
Expand Down
Loading

0 comments on commit 5003642

Please sign in to comment.