Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Try to use NSS package on Linux #1900

Merged
merged 39 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
89edb48
ci: Bump Linux CI runners to `ubuntu-24.04`
larseggert May 13, 2024
a35a2b7
Try libnss3-dev deb
larseggert May 13, 2024
ca16885
Merge branch 'main' into ci-ubuntu-24.04
larseggert May 21, 2024
aca2d37
Merge branch 'main' into ci-ubuntu-24.04
larseggert May 28, 2024
0c3b52d
See if updating fixes it
larseggert May 30, 2024
633ca35
Just upgrade
larseggert May 30, 2024
30fae0f
NEEDRESTART_MODE
larseggert May 30, 2024
273ff09
sudo apt remove needrestart
larseggert May 30, 2024
77e86ff
Again
larseggert May 30, 2024
b2760c7
Again
larseggert May 30, 2024
c961810
Merge branch 'main' into ci-ubuntu-24.04
larseggert Jun 15, 2024
794e279
Omit `python-version`
larseggert Jun 17, 2024
9f2c388
3.8 -> 3.12
larseggert Jun 17, 2024
57d0d43
ldd
larseggert Jun 17, 2024
568cc79
~/.pki
larseggert Jun 17, 2024
461129a
CHACHA20
larseggert Jun 17, 2024
d3f4138
rm test-fixture/db/pkcs11.txt
larseggert Jun 18, 2024
f2fa342
Minimize diff
larseggert Jun 18, 2024
ef03492
Merge branch 'main' into ci-ubuntu-24.04
larseggert Jun 18, 2024
ce988ef
Print APT info
larseggert Jun 19, 2024
5c2bb77
Again
larseggert Jun 19, 2024
1cc92f5
Use libnss3-dev
larseggert Jun 19, 2024
f3a97f6
Cleanup
larseggert Jun 19, 2024
31ee487
Try and avoid azure mirror
larseggert Jun 19, 2024
682c393
Again
larseggert Jun 19, 2024
ab5840d
Again
larseggert Jun 19, 2024
9d73a17
Again
larseggert Jun 19, 2024
9816392
Again
larseggert Jun 19, 2024
bf74b8a
Again
larseggert Jun 19, 2024
f9b72ea
Again
larseggert Jun 19, 2024
ee14497
Again
larseggert Jun 19, 2024
4c37072
Again
larseggert Jun 19, 2024
3a45251
Again
larseggert Jun 19, 2024
e235be5
Hunch
larseggert Jun 19, 2024
488d08a
Try
larseggert Jun 19, 2024
df49ee3
Minimize
larseggert Jun 19, 2024
fa0c6d0
Merge branch 'main' into ci-ubuntu-24.04
larseggert Jul 1, 2024
0129273
Merge branch 'main' into ci-ubuntu-24.04
larseggert Jul 12, 2024
ca693d6
24.04 -> latest
larseggert Jul 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/quic-interop-runner/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ runs:

- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: 3.8
python-version: 3.12
cache: 'pip'
cache-dependency-path: 'quic-interop-runner/requirements.txt'

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/actionlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ jobs:
run: |
echo "::add-matcher::.github/actionlint-matcher.json"
${{ steps.get_actionlint.outputs.executable }} -color

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
env:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get install -y --no-install-recommends gyp mercurial ninja-build lld
sudo apt-get install -y --no-install-recommends libnss3-dev pkg-config lld
echo "RUSTFLAGS=-C link-arg=-fuse-ld=lld" >> "$GITHUB_ENV"

- name: Install dependencies (MacOS)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
env:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get install -y --no-install-recommends gyp mercurial ninja-build lld
sudo apt-get install -y --no-install-recommends libnss3-dev pkg-config lld
echo "RUSTFLAGS=-C link-arg=-fuse-ld=lld" >> "$GITHUB_ENV"

- name: Fetch and build NSS and NSPR
Expand Down
20 changes: 6 additions & 14 deletions qns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM martenseemann/quic-network-simulator-endpoint@sha256:91b21d42e23023e08c5ed63c1c08ec24d058c4b30edd52aa3bd74bee87096a5b AS buildimage

RUN apt-get update && apt-get install -y --no-install-recommends \
git coreutils build-essential libclang-dev lld gyp ninja-build zlib1g-dev python \
libclang-dev libnss3-dev pkg-config lld \
&& apt-get autoremove -y && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -47,16 +47,6 @@ RUN set -eux; \

# End of copy from https://github.com/rust-lang/docker-rust...

ENV NSS_DIR=/nss \
NSPR_DIR=/nspr \
LD_LIBRARY_PATH=/dist/Release/lib

RUN set -eux; \
git clone --depth=1 https://github.com/nss-dev/nspr "$NSPR_DIR"; \
git clone --depth=1 https://github.com/nss-dev/nss "$NSS_DIR"

RUN "$NSS_DIR"/build.sh --static -Ddisable_tests=1 -o

ADD . /neqo

RUN set -eux; \
Expand All @@ -68,10 +58,12 @@ RUN set -eux; \

FROM martenseemann/quic-network-simulator-endpoint@sha256:91b21d42e23023e08c5ed63c1c08ec24d058c4b30edd52aa3bd74bee87096a5b

ENV LD_LIBRARY_PATH=/neqo/lib
RUN apt-get update && apt-get install -y --no-install-recommends \
libnss3-tools libnss3-dev \
&& apt-get autoremove -y && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

COPY --from=buildimage /neqo/target/release/neqo-client /neqo/target/release/neqo-server /neqo/bin/
COPY --from=buildimage /dist/Release/lib/*.so /neqo/lib/
COPY --from=buildimage /dist/Release/bin/certutil /dist/Release/bin/pk12util /neqo/bin/

COPY qns/interop.sh /neqo/
RUN chmod +x /neqo/interop.sh
Expand Down
Loading