Skip to content

Commit cf820e5

Browse files
committed
Merge #402: ci, build: Update GHA actions and fix build bugs
a485533 build: Re-add `qt/guiconstants.h` header (Hennadii Stepanov) 87909c1 build: Add missed `IPAddressValueInput.qml` to `QML_RES_QML` (Hennadii Stepanov) 935ee29 build: Fix `-Xclang -internal-isystem` option (Hennadii Stepanov) ac32ee9 ci: Update GHA actions (Hennadii Stepanov) Pull request description: The second commit has been cherry-picked from bitcoin/bitcoin#29195. Link to github actions build artifacts: [![Build Artifacts](https://img.shields.io/badge/Build%20Artifacts-green )](https://github.com/bitcoin-core/gui-qml/actions/runs/9242930899) ACKs for top commit: pablomartin4btc: ACK a485533 johnny9: ACK a485533 Tree-SHA512: ca5222033d4fd1bae3a128f8037187cd5d1d0c3a262a3034dda3d88b22463342016a0162e5ca9415a9db76a6dde8c205a183edf7cbb0e1dd722b4742d05ce9b2
2 parents 84d388d + a485533 commit cf820e5

File tree

4 files changed

+17
-15
lines changed

4 files changed

+17
-15
lines changed

.github/workflows/artifacts.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Depends cache
7474
id: depends_cache
75-
uses: actions/cache@v3
75+
uses: actions/cache@v4
7676
with:
7777
path: |
7878
depends/built
@@ -93,7 +93,7 @@ jobs:
9393
make -j$(nproc) HOST=${{ matrix.host.triplet }} LOG=1
9494
9595
- name: Restore Ccache cache
96-
uses: actions/cache/restore@v3
96+
uses: actions/cache/restore@v4
9797
id: ccache-cache
9898
with:
9999
path: ${{ env.CCACHE_DIR }}
@@ -112,13 +112,13 @@ jobs:
112112
ccache --version | head -n 1 && ccache --show-stats
113113
114114
- name: Save Ccache cache
115-
uses: actions/cache/save@v3
115+
uses: actions/cache/save@v4
116116
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
117117
with:
118118
path: ${{ env.CCACHE_DIR }}
119119
key: ${{ matrix.host.triplet }}-ccache-${{ github.run_id }}
120120

121-
- uses: actions/upload-artifact@v3
121+
- uses: actions/upload-artifact@v4
122122
with:
123123
name: ${{ matrix.host.artifact }}
124124
path: src/qt/${{ matrix.host.gui_exe }}
@@ -183,7 +183,7 @@ jobs:
183183
run: |
184184
make -j$(nproc) -C src/qt apk
185185
186-
- uses: actions/upload-artifact@v3
186+
- uses: actions/upload-artifact@v4
187187
with:
188188
name: ${{ matrix.host.artifact }}
189189
path: src/qt/android/build/outputs/apk/debug/android-debug.apk

.github/workflows/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: echo "CCACHE_DIR=${RUNNER_TEMP}/ccache_dir" >> "$GITHUB_ENV"
6767

6868
- name: Restore Ccache cache
69-
uses: actions/cache/restore@v3
69+
uses: actions/cache/restore@v4
7070
with:
7171
path: ${{ env.CCACHE_DIR }}
7272
key: ${{ github.job }}-ccache-${{ github.run_id }}
@@ -76,7 +76,7 @@ jobs:
7676
run: ./ci/test_run_all.sh
7777

7878
- name: Save Ccache cache
79-
uses: actions/cache/save@v3
79+
uses: actions/cache/save@v4
8080
if: github.event_name != 'pull_request'
8181
with:
8282
path: ${{ env.CCACHE_DIR }}
@@ -151,7 +151,7 @@ jobs:
151151
152152
- name: Restore static Qt cache
153153
id: static-qt-cache
154-
uses: actions/cache/restore@v3
154+
uses: actions/cache/restore@v4
155155
with:
156156
path: C:\Qt_static
157157
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
@@ -194,14 +194,14 @@ jobs:
194194

195195
- name: Save static Qt cache
196196
if: steps.static-qt-cache.outputs.cache-hit != 'true'
197-
uses: actions/cache/save@v3
197+
uses: actions/cache/save@v4
198198
with:
199199
path: C:\Qt_static
200200
key: ${{ github.job }}-static-qt-${{ hashFiles('msbuild_version', 'qt_url', 'qt_conf') }}
201201

202202
- name: Ccache installation cache
203203
id: ccache-installation-cache
204-
uses: actions/cache@v3
204+
uses: actions/cache@v4
205205
with:
206206
path: |
207207
C:\ProgramData\chocolatey\lib\ccache
@@ -217,7 +217,7 @@ jobs:
217217
Copy-Item -Path "$env:ChocolateyInstall\lib\ccache\tools\ccache-$env:CI_CCACHE_VERSION-windows-x86_64\ccache.exe" -Destination "C:\ccache\cl.exe"
218218
219219
- name: Restore Ccache cache
220-
uses: actions/cache/restore@v3
220+
uses: actions/cache/restore@v4
221221
with:
222222
path: ~/AppData/Local/ccache
223223
key: ${{ github.job }}-ccache-${{ github.run_id }}
@@ -232,13 +232,13 @@ jobs:
232232
Get-Content -Path "$env:GITHUB_WORKSPACE\vcpkg_commit"
233233
234234
- name: vcpkg tools cache
235-
uses: actions/cache@v3
235+
uses: actions/cache@v4
236236
with:
237237
path: C:/vcpkg/downloads/tools
238238
key: ${{ github.job }}-vcpkg-tools
239239

240240
- name: vcpkg binary cache
241-
uses: actions/cache@v3
241+
uses: actions/cache@v4
242242
with:
243243
path: ~/AppData/Local/vcpkg/archives
244244
key: ${{ github.job }}-vcpkg-binary-${{ hashFiles('vcpkg_commit', 'msbuild_version', 'build_msvc/vcpkg.json') }}
@@ -256,7 +256,7 @@ jobs:
256256
run: ccache --show-stats
257257

258258
- name: Save Ccache cache
259-
uses: actions/cache/save@v3
259+
uses: actions/cache/save@v4
260260
if: github.event_name != 'pull_request'
261261
with:
262262
path: ~/AppData/Local/ccache

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ case $host in
745745
dnl option to system-ify all /usr/local/include paths without adding it to the list
746746
dnl of search paths in case it's not already there.
747747
if test "$suppress_external_warnings" != "no"; then
748-
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem/usr/local/include], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem/usr/local/include"], [], [$CXXFLAG_WERROR])
748+
AX_CHECK_PREPROC_FLAG([-Xclang -internal-isystem -Xclang /usr/local/include/], [CORE_CPPFLAGS="$CORE_CPPFLAGS -Xclang -internal-isystem -Xclang /usr/local/include/"], [], [$CXXFLAG_WERROR])
749749
fi
750750

751751
if test "$use_bdb" != "no" && $BREW list --versions berkeley-db@4 >/dev/null && test "$BDB_CFLAGS" = "" && test "$BDB_LIBS" = ""; then

src/Makefile.qt.include

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ BITCOIN_QT_H = \
141141
qt/createwalletdialog.h \
142142
qt/csvmodelwriter.h \
143143
qt/editaddressdialog.h \
144+
qt/guiconstants.h \
144145
qt/guiutil.h \
145146
qt/initexecutor.h \
146147
qt/intro.h \
@@ -367,6 +368,7 @@ QML_RES_QML = \
367368
qml/controls/Header.qml \
368369
qml/controls/Icon.qml \
369370
qml/controls/InformationPage.qml \
371+
qml/controls/IPAddressValueInput.qml \
370372
qml/controls/NavButton.qml \
371373
qml/controls/PageIndicator.qml \
372374
qml/controls/NavigationBar.qml \

0 commit comments

Comments
 (0)