Skip to content

Commit

Permalink
Update tooling versions for actions (ni#704)
Browse files Browse the repository at this point in the history
Updates the tooling dependencies for VireoSDK such as:

- Node, Python, and Visual Studio versions (the `Build.md` was updated
to reflect that change)
- GitHub Action Operating Systems and Action versions

Notably this does not change:

- Emscripten toolchain versions
- JavaScript build dependency versions
- Note that the npm lock file is a mechanical change to their latest
format. I did a manual scan to verify that the effective package
versions did not change.
- Does not validate the xcode project / migrate to modern versions

Intention is to keep the pipeline healthy while avoiding any other
changes at least for this PR.
  • Loading branch information
rajsite authored Apr 27, 2024
1 parent 673eb0d commit 0410046
Show file tree
Hide file tree
Showing 11 changed files with 2,055 additions and 1,104 deletions.
72 changes: 36 additions & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ on:
jobs:
lint:
# if: 'false'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 25
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Install lint dependencies
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.7'
- uses: actions/setup-node@v1
python-version: '3.12'
- uses: actions/setup-node@v4
with:
node-version: '12'
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- run: npm ci

Expand All @@ -34,22 +34,22 @@ jobs:

web:
# if: 'false'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 25
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Install web dependencies
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.12'
- run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- run: nohup python -m httpbin.core --port 64526 --host 0.0.0.0 &
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: '12'
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: |
Expand All @@ -67,7 +67,7 @@ jobs:
- run: . emsdk/emsdk_env.sh && make vjs BUILD=profile
- run: . emsdk/emsdk_env.sh && make vjs BUILD=release TARGET=asmjs-unknown-emscripten
- run: npm pack
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: npm package
path: ./vireo-*.tgz
Expand Down Expand Up @@ -95,22 +95,22 @@ jobs:

web-windows:
# if: 'false'
runs-on: windows-2016
runs-on: windows-2022
timeout-minutes: 25
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Install web-windows dependencies
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: '12'
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: chocolatey install make -y
- run: chocolatey install gnuwin32-coreutils.portable -y
- uses: actions/setup-python@v2
- run: choco install make -y
- run: choco install gnuwin32-coreutils.portable -y
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.12'
- run: |
python -m pip install --upgrade pip
pip install tox
Expand All @@ -127,7 +127,7 @@ jobs:
# Build web-windows
- run: emsdk\emsdk_env.ps1 && make vjs
- run: npm pack
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: npm package win build
path: ./vireo-*.tgz
Expand All @@ -139,7 +139,7 @@ jobs:
- run: npm run test-min

setup:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 25
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
Expand All @@ -159,16 +159,16 @@ jobs:
windows:
# if: 'false'
needs: setup
runs-on: windows-2016
runs-on: windows-2022
timeout-minutes: 25
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Install windows dependencies
- uses: microsoft/setup-msbuild@v1
- uses: actions/setup-node@v1
- uses: microsoft/setup-msbuild@v2
- uses: actions/setup-node@v4
with:
node-version: '12'
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- run: npm ci

Expand All @@ -184,14 +184,14 @@ jobs:
- run: 7z a %ESH_32_DEBUG% .\dist\Debug\esh.exe .\dist\Debug\esh.pdb .\README.md .\LICENSE.txt
shell: cmd
working-directory: ${{env.GITHUB_WORKSPACE}}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: ${{ env.ESH_32_DEBUG }}
path: ${{ env.ESH_32_DEBUG }}
if-no-files-found: error
- uses: nuget/setup-nuget@v1
- uses: nuget/setup-nuget@v2
- run: nuget pack VireoSDK.nuspec -properties version="$Env:ESH_VERSION"
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: nuget package
path: ./*.nupkg
Expand Down Expand Up @@ -219,15 +219,15 @@ jobs:
linux:
# if: 'false'
needs: setup
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 25
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Install linux dependencies
- uses: actions/setup-node@v1
- uses: actions/setup-node@v4
with:
node-version: '12'
node-version: '20'
registry-url: 'https://registry.npmjs.org'
- run: npm ci
- run: echo gcc -v
Expand All @@ -240,7 +240,7 @@ jobs:
export ESH_64_RELEASE="esh_"$ESH_VERSION"_x86_64-unknown-linux-gnu_release.zip"
echo "ESH_64_RELEASE=$ESH_64_RELEASE" >> $GITHUB_ENV
- run: zip -j $ESH_64_RELEASE dist/esh README.md LICENSE.txt
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: ${{ env.ESH_64_RELEASE }}
path: ${{ env.ESH_64_RELEASE }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Vireo_VS/VireoCommandLine.sdf
Vireo_VS/VireoCommandLine.vcxproj.user
Vireo_VS/_Resharper.Caches/*
Vireo_VS/VireoCommandLine.sln.DotSettings.user
Vireo_VS/VireoCommandLine/*
**.VC.db
**.opendb
**.suo
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: MIT
<div align="center">
<div>
<a href="https://github.com/ni/VireoSDK">
<img width="300" height="165" src="https://raw.githubusercontent.com/ni/VireoSDK/HEAD/docs/vireo-logo.png" alt="Vireo logo">
<img width="335" height="326" src="docs/vireo-logo.png" alt="Vireo logo">
</a>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions Vireo_VS/VireoCommandLine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,19 @@
<ProjectGuid>{113F876C-CB35-4D2F-A3EF-C72215B288F7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>VireoCommandLine</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions Vireo_VS/VireoCommandLine.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
<ClCompile Include="..\source\core\CloseReference.cpp">
<Filter>VireoSource\Core</Filter>
</ClCompile>
<ClCompile Include="..\source\core\DebugPoint.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\source\include\ConversionTable.def">
Expand Down Expand Up @@ -283,8 +284,5 @@
<ClInclude Include="..\source\include\DebuggingToggles.h">
<Filter>VireoSource\Include</Filter>
</ClInclude>
<ClInclude Include="..\source\include\DebugPoint.h">
<Filter>VireoSource\Include</Filter>
</ClInclude>
</ItemGroup>
</Project>
8 changes: 5 additions & 3 deletions docs/Build.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Software requirements

- [git](https://git-scm.com/downloads)
- [Node.js](https://nodejs.org/en/) (>=12, latest LTS release recommended)
- [Node.js](https://nodejs.org/en/) (>=20, latest LTS release recommended)
- GNU Make and GNU core utilities (see following)

### Installing GNU Make and GNU core utilities
Expand All @@ -31,7 +31,7 @@ On all platforms run the following in the `VireoSDK` folder to install JavaScrip

### Software requirements

- [Python](https://www.python.org/) (>= 2.7.9)
- [Python](https://www.python.org/) (>= 3.12)
- emsdk toolchain (see following)

Note: Windows 10 may include a a copy of python seen by running `which python` resulting in the path: `C:\Users\<USER>\AppData\Local\Microsoft\WindowsApps\python.exe`. Make sure to install a copy of python from `python.org`.
Expand Down Expand Up @@ -90,7 +90,9 @@ Notice that vireo.js is created in the `dist` folder based on the `BUILD` type.

### Software requirements

- Visual Studio 2013, Visual Studio 2015, or Visual Studio 2017 with C++ support
- Visual Studio 2022 with C++ support, specifically:
- Windows 10 SDK (10.0.20348.0)
- MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16)

### Building Vireo Windows Native

Expand Down
Binary file modified docs/vireo-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion make-it/EmMakefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ $(OBJS):
@$(MKDIR) -p $(OBJS)

$(PREJS) $(POSTJS): $(CORESOURCEDIR)/vireo.wrapper.js
node splitVireoWrapper.js $(CORESOURCEDIR)/vireo.wrapper.js $(PREJS) $(POSTJS)
npm run split-wrapper -- $(CORESOURCEDIR)/vireo.wrapper.js $(PREJS) $(POSTJS)

vjs: $(DIST)/vireo.js $(DIST)/vireo.min.js

Expand Down
Loading

0 comments on commit 0410046

Please sign in to comment.