Skip to content

Commit 0796537

Browse files
treefrogframeworktreefrogframework
committed
Merge branch 'develop' into uring
2 parents d4bded2 + e5a8bee commit 0796537

369 files changed

Lines changed: 9853 additions & 9254 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/actions.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ jobs:
172172
run: |
173173
./testall.sh
174174
175-
build-macos:
176-
runs-on: macos-latest
175+
build-macos26:
176+
runs-on: macos-26
177177
steps:
178178
- uses: actions/checkout@main
179179
- name: Homebrew
@@ -222,8 +222,8 @@ jobs:
222222
run: |
223223
./testall.sh
224224
225-
build-macos-sharedlink:
226-
runs-on: macos-latest
225+
build-macos26-sharedlink:
226+
runs-on: macos-26
227227
steps:
228228
- uses: actions/checkout@main
229229
- name: Homebrew
@@ -268,8 +268,8 @@ jobs:
268268
run: |
269269
./testall.sh
270270
271-
build-macos14:
272-
runs-on: macos-14
271+
build-macos15:
272+
runs-on: macos-15
273273
steps:
274274
- uses: actions/checkout@main
275275
- name: Homebrew
@@ -314,15 +314,11 @@ jobs:
314314
run: |
315315
./testall.sh
316316
317-
build-windows-qt68-msvc2022:
318-
runs-on: windows-latest
317+
build-windows-qt68-msvc2026:
318+
runs-on: windows-2025-vs2026
319319
steps:
320-
- uses: actions/checkout@main
321-
- name: Setup msbuild
322-
uses: microsoft/setup-msbuild@v2
323-
with:
324-
vs-version: '[17,18)' # 17.xx
325-
msbuild-architecture: x64
320+
- name: Checkout repository
321+
uses: actions/checkout@main
326322
- name: Install Qt
327323
uses: jurplel/install-qt-action@v4
328324
with:
@@ -333,11 +329,10 @@ jobs:
333329
- name: Install tools
334330
run: |
335331
choco install sqlite -y --no-progress
336-
choco install cmake -y --version=3.31.7 --no-progress
337332
- name: Debug build
338333
shell: cmd
339334
run: |
340-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
335+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
341336
set CL=/MP
342337
qmake -version
343338
call configure.bat --enable-debug
@@ -351,11 +346,12 @@ jobs:
351346
shell: cmd
352347
working-directory: src/test
353348
run: |
349+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
354350
call testall.bat
355351
- name: Release build
356352
shell: cmd
357353
run: |
358-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
354+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
359355
set CL=/MP
360356
call configure.bat
361357
cd src
@@ -368,29 +364,33 @@ jobs:
368364
shell: cmd
369365
working-directory: tools\test
370366
run: |
367+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
371368
testall.bat
372369
373-
build-windows-qt68-msvc2019:
374-
runs-on: windows-latest
370+
build-windows-qt68-msvc2022:
371+
runs-on: windows-2022
375372
steps:
376373
- uses: actions/checkout@main
374+
- name: Checkout msbuild
375+
id: checkout_msbuild
376+
uses: microsoft/setup-msbuild@v3
377+
with:
378+
vs-version: '[17,18)' # 17.xx
379+
msbuild-architecture: x64
377380
- name: Install Qt
378381
uses: jurplel/install-qt-action@v4
379382
with:
380383
version: 6.8
381384
host: windows
382385
target: desktop
383386
setup-python: false
384-
- name: Install VisualStudio tools
387+
- name: Install tools
385388
run: |
386-
choco install visualstudio2019community -y --no-progress
387-
choco install visualstudio2019-workload-nativedesktop -y --no-progress
388389
choco install sqlite -y --no-progress
389-
choco install cmake -y --version=3.31.7 --no-progress
390390
- name: Debug build
391391
shell: cmd
392392
run: |
393-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
393+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
394394
set CL=/MP
395395
qmake -version
396396
call configure.bat --enable-debug
@@ -408,7 +408,7 @@ jobs:
408408
- name: Release build
409409
shell: cmd
410410
run: |
411-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
411+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
412412
set CL=/MP
413413
call configure.bat
414414
cd src
@@ -424,7 +424,7 @@ jobs:
424424
testall.bat
425425
426426
build-windows-qt65-msvc2019:
427-
runs-on: windows-latest
427+
runs-on: windows-2022
428428
steps:
429429
- uses: actions/checkout@main
430430
- name: Install Qt

‎3rdparty/glog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
glog-0.7.0
1+
glog-0.7.1

3rdparty/glog-0.7.0/.bazelci/presubmit.yml renamed to 3rdparty/glog-0.7.1/.bazelci/presubmit.yml

File renamed without changes.

3rdparty/glog-0.7.0/.clang-format renamed to 3rdparty/glog-0.7.1/.clang-format

File renamed without changes.

3rdparty/glog-0.7.0/.clang-tidy renamed to 3rdparty/glog-0.7.1/.clang-tidy

File renamed without changes.

3rdparty/glog-0.7.0/.gitattributes renamed to 3rdparty/glog-0.7.1/.gitattributes

File renamed without changes.

3rdparty/glog-0.7.0/.github/dependabot.yml renamed to 3rdparty/glog-0.7.1/.github/dependabot.yml

File renamed without changes.

3rdparty/glog-0.7.0/.github/workflows/android.yml renamed to 3rdparty/glog-0.7.1/.github/workflows/android.yml

File renamed without changes.

3rdparty/glog-0.7.0/.github/workflows/cifuzz.yml renamed to 3rdparty/glog-0.7.1/.github/workflows/cifuzz.yml

File renamed without changes.

3rdparty/glog-0.7.0/.github/workflows/emscripten.yml renamed to 3rdparty/glog-0.7.1/.github/workflows/emscripten.yml

File renamed without changes.

0 commit comments

Comments
 (0)