Skip to content

Commit 11baccc

Browse files
committed
Github Actions and download libs fix for VS2019
1 parent 1aa4fcd commit 11baccc

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

.github/workflows/of.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,48 @@ jobs:
160160
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
161161
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
162162
163+
build-vs2019:
164+
runs-on: windows-2019
165+
strategy:
166+
matrix:
167+
platform: [x64]
168+
env:
169+
BITS: ${{ matrix.bits }}
170+
steps:
171+
- name: Clone repository
172+
uses: actions/checkout@v4
173+
174+
- uses: msys2/setup-msys2@v2.24.1
175+
with:
176+
update: true
177+
install: >-
178+
git
179+
unzip
180+
181+
- name: Setup MSBuild
182+
uses: microsoft/setup-msbuild@v2
183+
with:
184+
vs-version: 2019
185+
186+
- name: Download libs
187+
run: ./scripts/vs/download_libs.sh --legacy -t $RELEASE -a ${{matrix.cfg.libs}}
188+
189+
- name: Download projectGenerator
190+
run: ./scripts/vs/download_projectGenerator.sh
191+
192+
- name: Build DEBUG and RELEASE emptyExample
193+
working-directory: ${{ env.GITHUB_WORKSPACE }}
194+
run: |
195+
msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
196+
msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
197+
198+
- name: Build DEBUG and RELEASE allAddonsExample
199+
working-directory: ${{ env.GITHUB_WORKSPACE }}
200+
run: |
201+
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
202+
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
203+
204+
163205
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
164206

165207
rpi-build:

scripts/dev/download_libs.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,13 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "vs" ]; then
258258
fi
259259
elif [ "$PLATFORM" == "vs" ]; then
260260
if [[ $BLEEDING_EDGE = 1 ]] ; then
261-
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_1.zip \
262-
openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_2.zip"
261+
if [[ $LEGACY == 1 ]]; then
262+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_2019_64_1.zip \
263+
openFrameworksLibs_${VER}_${PLATFORM}_2019_64_2.zip"
264+
else
265+
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_1.zip \
266+
openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_2.zip"
267+
fi
263268
else
264269
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_1.zip \
265270
openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}_2.zip \

0 commit comments

Comments
 (0)