Skip to content

Commit d38df80

Browse files
tomt1664tomt1664
committed
wip
1 parent 96ddc2b commit d38df80

1 file changed

Lines changed: 12 additions & 111 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ jobs:
4545
- name: Checkout
4646
uses: actions/checkout@v4
4747

48-
- name: Merge base branch (PR only)
49-
if: github.event_name == 'pull_request'
50-
run: |
51-
git config --global user.email "ci@ci.ci"
52-
git config --global user.name "ci"
53-
git fetch origin ${{ github.base_ref }}
54-
git merge origin/${{ github.base_ref }}
55-
5648
- name: Run CI
5749
run: ./ci/test_run_all.sh
5850

@@ -70,15 +62,6 @@ jobs:
7062
- name: Checkout
7163
uses: actions/checkout@v4
7264

73-
- name: Merge base branch (PR only)
74-
if: github.event_name == 'pull_request'
75-
run: |
76-
apt-get update && apt-get install -y git
77-
git config --global user.email "ci@ci.ci"
78-
git config --global user.name "ci"
79-
git fetch origin ${{ github.base_ref }}
80-
git merge origin/${{ github.base_ref }}
81-
8265
- name: Restore ccache
8366
uses: actions/cache/restore@v4
8467
with:
@@ -127,15 +110,6 @@ jobs:
127110
- name: Checkout
128111
uses: actions/checkout@v4
129112

130-
- name: Merge base branch (PR only)
131-
if: github.event_name == 'pull_request'
132-
run: |
133-
apt-get update && apt-get install -y git
134-
git config --global user.email "ci@ci.ci"
135-
git config --global user.name "ci"
136-
git fetch origin ${{ github.base_ref }}
137-
git merge origin/${{ github.base_ref }}
138-
139113
- name: Restore ccache
140114
uses: actions/cache/restore@v4
141115
with:
@@ -183,15 +157,6 @@ jobs:
183157
- name: Checkout
184158
uses: actions/checkout@v4
185159

186-
- name: Merge base branch (PR only)
187-
if: github.event_name == 'pull_request'
188-
run: |
189-
yum install -y git
190-
git config --global user.email "ci@ci.ci"
191-
git config --global user.name "ci"
192-
git fetch origin ${{ github.base_ref }}
193-
git merge origin/${{ github.base_ref }}
194-
195160
- name: Restore ccache
196161
uses: actions/cache/restore@v4
197162
with:
@@ -239,15 +204,6 @@ jobs:
239204
- name: Checkout
240205
uses: actions/checkout@v4
241206

242-
- name: Merge base branch (PR only)
243-
if: github.event_name == 'pull_request'
244-
run: |
245-
apt-get update && apt-get install -y git
246-
git config --global user.email "ci@ci.ci"
247-
git config --global user.name "ci"
248-
git fetch origin ${{ github.base_ref }}
249-
git merge origin/${{ github.base_ref }}
250-
251207
- name: Restore ccache
252208
uses: actions/cache/restore@v4
253209
with:
@@ -293,15 +249,6 @@ jobs:
293249
- name: Checkout
294250
uses: actions/checkout@v4
295251

296-
- name: Merge base branch (PR only)
297-
if: github.event_name == 'pull_request'
298-
run: |
299-
apt-get update && apt-get install -y git
300-
git config --global user.email "ci@ci.ci"
301-
git config --global user.name "ci"
302-
git fetch origin ${{ github.base_ref }}
303-
git merge origin/${{ github.base_ref }}
304-
305252
- name: Restore ccache
306253
uses: actions/cache/restore@v4
307254
with:
@@ -348,15 +295,6 @@ jobs:
348295
- name: Checkout
349296
uses: actions/checkout@v4
350297

351-
- name: Merge base branch (PR only)
352-
if: github.event_name == 'pull_request'
353-
run: |
354-
apt-get update && apt-get install -y git
355-
git config --global user.email "ci@ci.ci"
356-
git config --global user.name "ci"
357-
git fetch origin ${{ github.base_ref }}
358-
git merge origin/${{ github.base_ref }}
359-
360298
- name: Restore ccache
361299
uses: actions/cache/restore@v4
362300
with:
@@ -402,15 +340,6 @@ jobs:
402340
- name: Checkout
403341
uses: actions/checkout@v4
404342

405-
- name: Merge base branch (PR only)
406-
if: github.event_name == 'pull_request'
407-
run: |
408-
apt-get update && apt-get install -y git
409-
git config --global user.email "ci@ci.ci"
410-
git config --global user.name "ci"
411-
git fetch origin ${{ github.base_ref }}
412-
git merge origin/${{ github.base_ref }}
413-
414343
- name: Restore ccache
415344
uses: actions/cache/restore@v4
416345
with:
@@ -457,14 +386,6 @@ jobs:
457386
- name: Checkout
458387
uses: actions/checkout@v4
459388

460-
- name: Merge base branch (PR only)
461-
if: github.event_name == 'pull_request'
462-
run: |
463-
git config --global user.email "ci@ci.ci"
464-
git config --global user.name "ci"
465-
git fetch origin ${{ github.base_ref }}
466-
git merge origin/${{ github.base_ref }}
467-
468389
- name: Restore ccache
469390
uses: actions/cache/restore@v4
470391
with:
@@ -511,14 +432,6 @@ jobs:
511432
- name: Checkout
512433
uses: actions/checkout@v4
513434

514-
- name: Merge base branch (PR only)
515-
if: github.event_name == 'pull_request'
516-
run: |
517-
git config --global user.email "ci@ci.ci"
518-
git config --global user.name "ci"
519-
git fetch origin ${{ github.base_ref }}
520-
git merge origin/${{ github.base_ref }}
521-
522435
- name: Restore macOS SDK cache
523436
uses: actions/cache/restore@v4
524437
with:
@@ -580,14 +493,6 @@ jobs:
580493
- name: Checkout
581494
uses: actions/checkout@v4
582495

583-
- name: Merge base branch (PR only)
584-
if: github.event_name == 'pull_request'
585-
run: |
586-
git config --global user.email "ci@ci.ci"
587-
git config --global user.name "ci"
588-
git fetch origin ${{ github.base_ref }}
589-
git merge origin/${{ github.base_ref }}
590-
591496
- name: Check clang version
592497
run: clang --version
593498

@@ -625,14 +530,6 @@ jobs:
625530
- name: Checkout
626531
uses: actions/checkout@v4
627532

628-
- name: Merge base branch (PR only)
629-
if: github.event_name == 'pull_request'
630-
run: |
631-
git config --global user.email "ci@ci.ci"
632-
git config --global user.name "ci"
633-
git fetch origin ${{ github.base_ref }}
634-
git merge origin/${{ github.base_ref }}
635-
636533
# On the persistent runner the "releases/" folder persists on disk
637534
# between runs. We still use cache as a fallback / for portability,
638535
# but the on-disk copy will be used if present.
@@ -715,6 +612,11 @@ jobs:
715612
mkdir C:\jom
716613
tar -xf C:\jom.zip -C C:\jom
717614
615+
- name: Check available VS installations
616+
shell: pwsh
617+
run: |
618+
& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -all -format json
619+
718620
- name: Build Qt static
719621
if: steps.qt-cache.outputs.cache-hit != 'true'
720622
shell: pwsh
@@ -723,13 +625,10 @@ jobs:
723625
Write-Host "Extracting Qt source..."
724626
tar -xf $env:QT_LOCAL_PATH -C C:\
725627
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" `
726-
-version "[16.0,17.0)" -property installationPath
727-
if (-not $vsPath) {
728-
throw "VS 2019 build tools not found. Required for Qt/Elements toolset compatibility."
729-
}
628+
-latest -property installationPath
730629
Write-Host "Using VS at: $vsPath"
731-
cmd /c "`"$vsPath\VC\Auxiliary\Build\vcvars64.bat`" && cd /d $env:QT_SOURCE_DIR && mkdir build && cd build && ..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml -prefix $env:QTBASEDIR && C:\jom\jom.exe && C:\jom\jom.exe install"
732-
630+
cmd /c "`"$vsPath\VC\Auxiliary\Build\vcvars64.bat`" -vcvars_ver=14.29 && cd /d $env:QT_SOURCE_DIR && mkdir build && cd build && ..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml -prefix $env:QTBASEDIR && C:\jom\jom.exe && C:\jom\jom.exe install"
631+
733632
- name: Restore vcpkg tools cache
734633
uses: actions/cache@v4
735634
with:
@@ -770,9 +669,11 @@ jobs:
770669
cd $env:GITHUB_WORKSPACE
771670
python build_msvc\msvc-autogen.py
772671
$vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" `
773-
-version "[16.0,17.0)" -property installationPath
672+
-latest -property installationPath
774673
$msbuild = "$vsPath\MSBuild\Current\Bin\MSBuild.exe"
775-
& $msbuild build_msvc\bitcoin.sln /property:Configuration=Release /maxCpuCount /verbosity:minimal /noLogo
674+
& $msbuild build_msvc\bitcoin.sln /property:Configuration=Release `
675+
/property:PlatformToolset=v142 `
676+
/maxCpuCount /verbosity:minimal /noLogo
776677
777678
- name: Run short functional tests
778679
shell: cmd

0 commit comments

Comments
 (0)