Skip to content

Commit 5cba526

Browse files
pmienkpmienk
authored
Merge pull request #296 from pmienk/master
Regenerate artifacts.
2 parents d10aab9 + 240f2e5 commit 5cba526

File tree

8 files changed

+20
-11
lines changed

8 files changed

+20
-11
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ jobs:
9898
detectcpuflags: "ignore"
9999
boost: "--build-boost"
100100
icu: ""
101-
llvm: "llvm@16"
101+
llvm: ""
102102
secp256k1: "--build-secp256k1"
103103
zmq: "--build-zmq"
104104
cc: "clang"
105105
flags: "-Os -fPIE"
106106
options: "--enable-isystem"
107107
packager: "brew"
108-
packages: "llvm@16 icu4c"
108+
packages: "icu4c"
109109

110110
- os: macos-latest
111111
cxx: "clang++"
@@ -116,14 +116,14 @@ jobs:
116116
detectcpuflags: "ignore"
117117
boost: "--build-boost"
118118
icu: ""
119-
llvm: "llvm@16"
119+
llvm: ""
120120
secp256k1: "--build-secp256k1"
121121
zmq: "--build-zmq"
122122
cc: "clang"
123123
flags: "-Os -fvisibility=hidden -fPIE"
124124
options: "--enable-isystem"
125125
packager: "brew"
126-
packages: "llvm@16 icu4c"
126+
packages: "icu4c"
127127

128128

129129
runs-on: ${{ matrix.os }}
@@ -153,7 +153,7 @@ jobs:
153153
if: ${{ matrix.packager == 'brew' }}
154154
run: |
155155
brew install autoconf automake libtool ${{ matrix.packages }}
156-
if [[ -n ${{ matrix.llvm }} ]]; then
156+
if [[ -n "${{ matrix.llvm }}" ]]; then
157157
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
158158
fi
159159
@@ -376,14 +376,14 @@ jobs:
376376
detectcpuflags: "ignore"
377377
boost: "--build-boost"
378378
icu: ""
379-
llvm: "llvm@16"
379+
llvm: ""
380380
secp256k1: "--build-secp256k1"
381381
zmq: "--build-zmq"
382382
cc: "clang"
383383
flags: "-Os -fPIE"
384384
options: ""
385385
packager: "brew"
386-
packages: "llvm@16 icu4c"
386+
packages: "icu4c"
387387

388388
- os: macos-latest
389389
cxx: "clang++"
@@ -394,14 +394,14 @@ jobs:
394394
detectcpuflags: "ignore"
395395
boost: "--build-boost"
396396
icu: ""
397-
llvm: "llvm@16"
397+
llvm: ""
398398
secp256k1: "--build-secp256k1"
399399
zmq: "--build-zmq"
400400
cc: "clang"
401401
flags: "-Os -fvisibility=hidden -fPIE"
402402
options: ""
403403
packager: "brew"
404-
packages: "llvm@16 icu4c"
404+
packages: "icu4c"
405405

406406

407407
runs-on: ${{ matrix.os }}
@@ -431,7 +431,7 @@ jobs:
431431
if: ${{ matrix.packager == 'brew' }}
432432
run: |
433433
brew install autoconf automake libtool ${{ matrix.packages }}
434-
if [[ -n ${{ matrix.llvm }} ]]; then
434+
if [[ -n "${{ matrix.llvm }}" ]]; then
435435
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
436436
fi
437437
@@ -671,7 +671,7 @@ jobs:
671671
if: ${{ matrix.packager == 'brew' }}
672672
run: |
673673
brew install autoconf automake libtool ${{ matrix.packages }}
674-
if [[ -n ${{ matrix.llvm }} ]]; then
674+
if [[ -n "${{ matrix.llvm }}" ]]; then
675675
echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV
676676
fi
677677

‎builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
149149
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
150150
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
151+
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
151152
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
152153
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
153154
</ImportGroup>
@@ -161,6 +162,7 @@
161162
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
162163
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
163164
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
165+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
164166
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
165167
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />
166168
</Target>

‎builds/msvc/vs2022/libbitcoin-protocol-test/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
15+
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
1516
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
1617
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
1718
</packages>

‎builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
167167
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
168168
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
169+
<Import Project="$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" />
169170
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
170171
</ImportGroup>
171172
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -178,6 +179,7 @@
178179
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
179180
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
180181
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
182+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_url-vc143.1.86.0\build\boost_url-vc143.targets'))" />
181183
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
182184
</Target>
183185
<ItemGroup>

‎builds/msvc/vs2022/libbitcoin-protocol/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1313
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
15+
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
1516
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
1617
</packages>

‎install-cmake.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ BOOST_OPTIONS=(
10381038
"--with-locale" \
10391039
"--with-program_options" \
10401040
"--with-thread" \
1041+
"--with-url" \
10411042
"--with-test")
10421043

10431044
# Define secp256k1 options.

‎install-cmakepresets.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@ BOOST_OPTIONS=(
10801080
"--with-locale" \
10811081
"--with-program_options" \
10821082
"--with-thread" \
1083+
"--with-url" \
10831084
"--with-test")
10841085

10851086
# Define secp256k1 options.

‎install.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,7 @@ BOOST_OPTIONS=(
912912
"--with-locale" \
913913
"--with-program_options" \
914914
"--with-thread" \
915+
"--with-url" \
915916
"--with-test")
916917

917918
# Define secp256k1 options.

0 commit comments

Comments
 (0)