Compare commits

...

22 Commits

Author SHA1 Message Date
JCW
2a9d6239ee Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:18:26 +01:00
JCW
05d8e96bd0 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:17:54 +01:00
JCW
fc52d554a7 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:15:13 +01:00
JCW
8336a0d915 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:12:34 +01:00
JCW
0719c51319 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:09:59 +01:00
JCW
74c82707f0 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:05:53 +01:00
JCW
d8e91c0d35 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:02:37 +01:00
JCW
cadd32fd94 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 17:02:25 +01:00
JCW
850bb47805 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:59:15 +01:00
JCW
d92d09a1df Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:57:55 +01:00
JCW
ef512abbf7 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:56:58 +01:00
JCW
c0a83faddf Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:27:41 +01:00
JCW
257ebca4fe Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:25:25 +01:00
JCW
313ed535a7 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:21:40 +01:00
JCW
de9d050e52 Test
Signed-off-by: JCW <a1q123456@users.noreply.github.com>
2025-07-22 16:20:21 +01:00
Bart Thomee
95a8d84f1f Temporarily compile using Clang 17 2025-07-22 10:44:19 -04:00
Bart Thomee
5a2004332b Temporarily compile using Clang 17 2025-07-22 10:32:26 -04:00
Bart Thomee
9a56a5b788 Temporarily disable ripple remote 2025-07-21 17:45:16 -04:00
Bart Thomee
605c8bd377 Temporarily disable ripple remote 2025-07-21 17:10:19 -04:00
Bart Thomee
900131d09f Temporarily disable ripple remote 2025-07-21 16:36:24 -04:00
Bart Thomee
01bdb87b39 Explicitly specify version of abseil to use 2025-07-21 16:13:24 -04:00
Bart Thomee
274a7303ff Updates protobuf and grpc 2025-07-21 15:14:56 -04:00
6 changed files with 14 additions and 12 deletions

View File

@@ -24,7 +24,7 @@ runs:
echo "Added conan remote ripple at ${CONAN_URL}" echo "Added conan remote ripple at ${CONAN_URL}"
- name: try to authenticate to Ripple Conan remote - name: try to authenticate to Ripple Conan remote
if: env.CONAN_LOGIN_USERNAME_RIPPLE != '' && env.CONAN_PASSWORD_RIPPLE != '' if: env.CONAN_URL != '' && env.CONAN_LOGIN_USERNAME_RIPPLE != '' && env.CONAN_PASSWORD_RIPPLE != ''
id: remote id: remote
shell: bash shell: bash
run: | run: |

View File

@@ -21,6 +21,10 @@ jobs:
shell: bash shell: bash
run: | run: |
set -o pipefail set -o pipefail
pwd
whoami
ls -la .git
git branch
git diff --exit-code | tee "clang-format.patch" git diff --exit-code | tee "clang-format.patch"
- name: Upload patch - name: Upload patch
if: failure() && steps.assert.outcome == 'failure' if: failure() && steps.assert.outcome == 'failure'

View File

@@ -18,7 +18,7 @@ concurrency:
# This part of Conan configuration is specific to this workflow only; we do not want # This part of Conan configuration is specific to this workflow only; we do not want
# to pollute conan/profiles directory with settings which might not work for others # to pollute conan/profiles directory with settings which might not work for others
env: env:
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev #CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }} CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }} CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
CONAN_GLOBAL_CONF: | CONAN_GLOBAL_CONF: |

View File

@@ -19,7 +19,7 @@ concurrency:
# This part of Conan configuration is specific to this workflow only; we do not want # This part of Conan configuration is specific to this workflow only; we do not want
# to pollute conan/profiles directory with settings which might not work for others # to pollute conan/profiles directory with settings which might not work for others
env: env:
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev #CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }} CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }} CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
CONAN_GLOBAL_CONF: | CONAN_GLOBAL_CONF: |
@@ -73,7 +73,7 @@ jobs:
distro: ubuntu distro: ubuntu
codename: jammy codename: jammy
- compiler: clang - compiler: clang
compiler_version: 16 compiler_version: 17
distro: debian distro: debian
codename: bookworm codename: bookworm
runs-on: [self-hosted, heavy] runs-on: [self-hosted, heavy]
@@ -129,7 +129,7 @@ jobs:
distro: ubuntu distro: ubuntu
codename: jammy codename: jammy
- compiler: clang - compiler: clang
compiler_version: 16 compiler_version: 17
distro: debian distro: debian
codename: bookworm codename: bookworm
cmake-args: cmake-args:
@@ -365,10 +365,8 @@ jobs:
instrumentation-build: instrumentation-build:
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }} if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
env:
CLANG_RELEASE: 16
runs-on: [self-hosted, heavy] runs-on: [self-hosted, heavy]
container: ghcr.io/xrplf/ci/debian-bookworm:clang-16 container: ghcr.io/xrplf/ci/debian-bookworm:clang-17
steps: steps:
- name: checkout - name: checkout

View File

@@ -21,7 +21,7 @@ concurrency:
# This part of Conan configuration is specific to this workflow only; we do not want # This part of Conan configuration is specific to this workflow only; we do not want
# to pollute conan/profiles directory with settings which might not work for others # to pollute conan/profiles directory with settings which might not work for others
env: env:
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev #CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }} CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }} CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
CONAN_GLOBAL_CONF: | CONAN_GLOBAL_CONF: |

View File

@@ -24,7 +24,7 @@ class Xrpl(ConanFile):
} }
requires = [ requires = [
'grpc/1.50.1', 'grpc/1.72.0',
'libarchive/3.8.1', 'libarchive/3.8.1',
'nudb/2.0.9', 'nudb/2.0.9',
'openssl/1.1.1w', 'openssl/1.1.1w',
@@ -37,7 +37,7 @@ class Xrpl(ConanFile):
] ]
tool_requires = [ tool_requires = [
'protobuf/3.21.12', 'protobuf/6.30.1',
] ]
default_options = { default_options = {
@@ -107,7 +107,7 @@ class Xrpl(ConanFile):
self.requires('boost/1.83.0', force=True, **transitive_headers_opt) self.requires('boost/1.83.0', force=True, **transitive_headers_opt)
self.requires('date/3.0.4', **transitive_headers_opt) self.requires('date/3.0.4', **transitive_headers_opt)
self.requires('lz4/1.10.0', force=True) self.requires('lz4/1.10.0', force=True)
self.requires('protobuf/3.21.12', force=True) self.requires('protobuf/6.30.1', force=True)
self.requires('sqlite3/3.49.1', force=True) self.requires('sqlite3/3.49.1', force=True)
if self.options.jemalloc: if self.options.jemalloc:
self.requires('jemalloc/5.3.0') self.requires('jemalloc/5.3.0')