Skip to content

Commit

Permalink
add ubuntu 24 and gcc 14 (#553)
Browse files Browse the repository at this point in the history
* add ubuntu 24 and gcc 14

* upgrade bearssl

* Fix nim-1-6 gcc-14 issue.

* rename target to linux-gcc-14

* Bump bearssl.

---------

Co-authored-by: cheatfate <eugene.kabanov@status.im>
  • Loading branch information
diegomrsantos and cheatfate committed Jul 18, 2024
1 parent 8f609b6 commit dc3847e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 2 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
target:
- os: linux
cpu: amd64
- os: linux-gcc-14 # this is to use ubuntu 24 and install gcc 14. Must be removed when ubuntu-latest is 24.04
cpu: amd64
- os: linux
cpu: i386
- os: macos
Expand All @@ -32,6 +34,10 @@ jobs:
os: linux
builder: ubuntu-latest
shell: bash
- target:
os: linux-gcc-14 # this is to use ubuntu 24 and install gcc 14. Must be removed when ubuntu-latest is 24.04
builder: ubuntu-24.04
shell: bash
- target:
os: macos
cpu: amd64
Expand Down Expand Up @@ -165,6 +171,15 @@ jobs:
bash build_nim.sh nim csources dist/nimble NimBinaries
echo '${{ github.workspace }}/nim/bin' >> $GITHUB_PATH
- name: Use gcc 14 # Must be removed when ubuntu-latest is 24.04 and gcc 14 is the default
if : ${{ matrix.target.os == 'linux-gcc-14' }}
run: |
# Add GCC-14 to alternatives
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 14
# Set GCC-14 as the default
sudo update-alternatives --set gcc /usr/bin/gcc-14

- name: Run tests
run: |
nim --version
Expand Down
2 changes: 1 addition & 1 deletion chronos.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ skipDirs = @["tests"]
requires "nim >= 1.6.16",
"results",
"stew",
"bearssl >= 0.2.3",
"bearssl >= 0.2.5",
"httputils",
"unittest2"

Expand Down
3 changes: 2 additions & 1 deletion chronos/streams/tlsstream.nim
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@ proc newTLSClientAsyncStream*(

if TLSFlags.NoVerifyHost in flags:
sslClientInitFull(res.ccontext, addr res.x509, nil, 0)
x509NoanchorInit(res.xwc, addr res.x509.vtable)
x509NoanchorInit(res.xwc,
X509ClassPointerConst(addr res.x509.vtable))
sslEngineSetX509(res.ccontext.eng,
X509ClassPointerConst(addr res.xwc.vtable))
else:
Expand Down

0 comments on commit dc3847e

Please sign in to comment.