From ab7b6d7427870e1a2e602833579b8942ab7da3d8 Mon Sep 17 00:00:00 2001 From: Antonio Barcelos Date: Tue, 8 Mar 2022 15:07:05 +0100 Subject: [PATCH 1/3] testkit: Add support for building the Deno driver --- package.json | 1 + testkit/Dockerfile | 5 +++++ testkit/build.py | 1 + 3 files changed, 7 insertions(+) diff --git a/package.json b/package.json index 099e7911c..e3bb79e14 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "scripts": { "clean": "lerna clean -y && lerna run clean", "build": "lerna bootstrap --ci", + "build::deno": "(cd ./packages/neo4j-driver-deno && deno run --allow-read --allow-write --allow-net ./generate.ts --version=5.0.0-dev)", "docs": "lerna run docs --stream --concurrency 1", "test::unit": "lerna run test::unit --stream", "test::integration": "lerna run test::integration --stream", diff --git a/testkit/Dockerfile b/testkit/Dockerfile index 147771dcf..2cd93b293 100644 --- a/testkit/Dockerfile +++ b/testkit/Dockerfile @@ -57,5 +57,10 @@ CMD /bin/bash RUN mkdir /home/driver/.npm_global RUN npm config set prefix /home/driver/.npm_global +# Add Deno +RUN curl -fsSL https://deno.land/x/install/install.sh | sh + +## Versions RUN node --version RUN npm --version +RUN deno --version diff --git a/testkit/build.py b/testkit/build.py index 460019e85..ae9292b17 100644 --- a/testkit/build.py +++ b/testkit/build.py @@ -20,6 +20,7 @@ def init_monorepo(): def clean_and_build(): run_in_driver_repo(["npm", "run", "clean"], env=os.environ) run_in_driver_repo(["npm", "run", "build"], env=os.environ) + run_in_driver_repo(["npm", "run", "build::deno"], env=os.environ) if __name__ == "__main__": From 3639f4459c455815261739db27853baf78231f2e Mon Sep 17 00:00:00 2001 From: Antonio Barcelos Date: Tue, 8 Mar 2022 15:34:42 +0100 Subject: [PATCH 2/3] Add unzip --- testkit/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/testkit/Dockerfile b/testkit/Dockerfile index 2cd93b293..0d3d8b611 100644 --- a/testkit/Dockerfile +++ b/testkit/Dockerfile @@ -23,6 +23,7 @@ RUN apt-get update && \ nodejs \ firefox \ nodejs \ + unzip \ && rm -rf /var/lib/apt/lists/* RUN /bin/bash -c "hash -d npm" From 6ffe44b8d8ecd629bc5ebd51c2fa1e93edd03d95 Mon Sep 17 00:00:00 2001 From: Antonio Barcelos Date: Tue, 8 Mar 2022 16:01:54 +0100 Subject: [PATCH 3/3] Move Deno creation up in the stream --- testkit/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testkit/Dockerfile b/testkit/Dockerfile index 0d3d8b611..a65f7ad1c 100644 --- a/testkit/Dockerfile +++ b/testkit/Dockerfile @@ -46,6 +46,10 @@ COPY CustomCAs/* /usr/local/share/custom-ca-certificates/ RUN update-ca-certificates --verbose +# Add Deno +RUN curl -fsSL https://deno.land/x/install/install.sh | sh +RUN mv /root/.deno/bin/deno /usr/bin/ + # Creating an user for building the driver and running the tests RUN useradd -m driver && echo "driver:driver" | chpasswd && adduser driver sudo VOLUME /driver @@ -58,8 +62,6 @@ CMD /bin/bash RUN mkdir /home/driver/.npm_global RUN npm config set prefix /home/driver/.npm_global -# Add Deno -RUN curl -fsSL https://deno.land/x/install/install.sh | sh ## Versions RUN node --version