Skip to content

Commit 30426c2

Browse files
committed
Adjust CI workflows for GitHub and AppVeyor
1 parent e0eec28 commit 30426c2

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

.appveyor.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AppVeyor script for wxSQLite3
22

33
image:
4-
- Visual Studio 2017
4+
- Visual Studio 2022
55

66
# branches to build
77
branches:
@@ -13,7 +13,7 @@ environment:
1313
matrix:
1414
- TOOLSET: msbuild
1515
CONFIGURATION: Release_wxDLL
16-
ARCH: Win64
16+
ARCH: x64
1717
# - TOOLSET: cmake
1818
# GENERATOR: 'Visual Studio 14.1'
1919
# SHARED: ON
@@ -27,14 +27,14 @@ before_build:
2727
# set environment variables for wxWidgets
2828
- set WXWIN=C:\wxWidgets
2929
- set wxWidgets_ROOT_DIR=%WXWIN%
30-
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxMSW-3.2.4_vc14x_x64_Dev.7z'
31-
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxMSW-3.2.4_vc14x_x64_ReleaseDLL.7z'
32-
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxMSW-3.2.4_vc14x_x64_ReleasePDB.7z'
33-
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.4/wxWidgets-3.2.4-headers.7z'
34-
- cmd: 7z x wxMSW-3.2.4_vc14x_x64_Dev.7z -oC:\wxWidgets -aoa
35-
- cmd: 7z x wxMSW-3.2.4_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets -aoa
36-
- cmd: 7z x wxMSW-3.2.4_vc14x_x64_ReleasePDB.7z -oC:\wxWidgets -aoa
37-
- cmd: 7z x wxWidgets-3.2.4-headers.7z -oC:\wxWidgets -aoa
30+
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.10/wxMSW-3.2.10_vc14x_x64_Dev.7z'
31+
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.10/wxMSW-3.2.10_vc14x_x64_ReleaseDLL.7z'
32+
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.10/wxMSW-3.2.10_vc14x_x64_ReleasePDB.7z'
33+
- ps: Start-FileDownload 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.10/wxWidgets-3.2.10-headers.7z'
34+
- cmd: 7z x wxMSW-3.2.10_vc14x_x64_Dev.7z -oC:\wxWidgets -aoa
35+
- cmd: 7z x wxMSW-3.2.10_vc14x_x64_ReleaseDLL.7z -oC:\wxWidgets -aoa
36+
- cmd: 7z x wxMSW-3.2.10_vc14x_x64_ReleasePDB.7z -oC:\wxWidgets -aoa
37+
- cmd: 7z x wxWidgets-3.2.10-headers.7z -oC:\wxWidgets -aoa
3838

3939
# build script
4040
build_script: c:\projects\wxsqlite3\admin\appveyor\appveyor.bat

.github/workflows/ci4wxsqlite3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
brew install wxmac
2828
if: matrix.os == 'macos-latest'
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
- name: Configure
3232
run: |
3333
autoreconf

admin/appveyor/appveyor-test.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ goto %TOOLSET%
88

99
:msbuild
1010
PATH=%WXWIN%\lib\vc14x_x64_dll;%PATH%
11-
".\build\bin\vc15\%ARCH%\%CONFIGURATION%\minimal.exe" -t -s .\samples
11+
".\build\bin\vc17\%ARCH%\%CONFIGURATION%\minimal.exe" -t -s .\samples
1212
goto :eof
1313

1414
:error

admin/appveyor/appveyor.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ goto %TOOLSET%
33

44
:msbuild
55
cd build
6-
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wxsqlite3_vc15.sln %MSBUILD_LOGGER%
6+
msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wxsqlite3_vc17.sln %MSBUILD_LOGGER%
77
goto :eof
88

99
:error

0 commit comments

Comments
 (0)