Update deps and fix types (#359)

SonarSource · Jul 20, 2022 · b211bf1 · b211bf1
1 parent ba13341
commit b211bf1
Show file tree

Hide file tree

Showing 11 changed files with 1,765 additions and 2,669 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -25,7 +25,8 @@ build_task:
     matrix:
       - dockerfile: .cirrus/nodejs-12.Dockerfile
       - dockerfile: .cirrus/nodejs-14.Dockerfile
-      - dockerfile: .cirrus/nodejs-15.Dockerfile
+      - dockerfile: .cirrus/nodejs-16.Dockerfile
+      - dockerfile: .cirrus/nodejs-18.Dockerfile
     <<: *CONTAINER_DEFINITION
     cpu: 3
     memory: 8G

diff --git a/.cirrus/nodejs-12.Dockerfile b/.cirrus/nodejs-12.Dockerfile
@@ -2,16 +2,16 @@ FROM eu.gcr.io/release-engineering-ci-prod/base:j11-latest
 
 USER root
 
-ENV NODE_VERSION v12.22.7
+ENV NODE_VERSION v12.22.12
 
-RUN  wget -U "nodejs" -q -O nodejs.tar.xz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz \
-    && tar -xJf "nodejs.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-    && rm nodejs.tar.xz \
+RUN  wget -U "nodejs" -q -O nodejs.tar.gz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz \
+    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 --no-same-owner \
+    && rm nodejs.tar.gz \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.3.0.2102.zip" -o /tmp/sonar-scanner.zip \
+RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747.zip" -o /tmp/sonar-scanner.zip \
   && unzip -d /opt /tmp/sonar-scanner.zip \
-  && mv /opt/sonar-scanner-4.3.0.2102 /opt/sonar-scanner \
+  && mv /opt/sonar-scanner-4.7.0.2747 /opt/sonar-scanner \
   && rm /tmp/sonar-scanner.zip
 
 USER sonarsource

diff --git a/.cirrus/nodejs-14.Dockerfile b/.cirrus/nodejs-14.Dockerfile
@@ -2,16 +2,16 @@ FROM eu.gcr.io/release-engineering-ci-prod/base:j11-latest
 
 USER root
 
-ENV NODE_VERSION v14.15.4
+ENV NODE_VERSION v14.20.0
 
-RUN  wget -U "nodejs" -q -O nodejs.tar.xz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.xz \
-    && tar -xJf "nodejs.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-    && rm nodejs.tar.xz \
+RUN  wget -U "nodejs" -q -O nodejs.tar.gz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz \
+    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 --no-same-owner \
+    && rm nodejs.tar.gz \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.3.0.2102.zip" -o /tmp/sonar-scanner.zip \
+RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747.zip" -o /tmp/sonar-scanner.zip \
   && unzip -d /opt /tmp/sonar-scanner.zip \
-  && mv /opt/sonar-scanner-4.3.0.2102 /opt/sonar-scanner \
+  && mv /opt/sonar-scanner-4.7.0.2747 /opt/sonar-scanner \
   && rm /tmp/sonar-scanner.zip
 
 USER sonarsource

diff --git a/.cirrus/nodejs-15.Dockerfile b/.cirrus/nodejs-15.Dockerfile
diff --git a/.cirrus/nodejs-16.Dockerfile b/.cirrus/nodejs-16.Dockerfile
@@ -0,0 +1,19 @@
+FROM eu.gcr.io/release-engineering-ci-prod/base:j11-latest
+
+USER root
+
+ENV NODE_VERSION v16.16.0
+
+RUN  wget -U "nodejs" -q -O nodejs.tar.gz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz \
+    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 --no-same-owner \
+    && rm nodejs.tar.gz \
+    && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747.zip" -o /tmp/sonar-scanner.zip \
+  && unzip -d /opt /tmp/sonar-scanner.zip \
+  && mv /opt/sonar-scanner-4.7.0.2747 /opt/sonar-scanner \
+  && rm /tmp/sonar-scanner.zip
+
+USER sonarsource
+
+ENV PATH "/opt/sonar-scanner/bin:${PATH}"
diff --git a/.cirrus/nodejs-18.Dockerfile b/.cirrus/nodejs-18.Dockerfile
@@ -0,0 +1,19 @@
+FROM eu.gcr.io/release-engineering-ci-prod/base:j11-latest
+
+USER root
+
+ENV NODE_VERSION v18.6.0
+
+RUN  wget -U "nodejs" -q -O nodejs.tar.gz https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz \
+    && tar -xzf "nodejs.tar.gz" -C /usr/local --strip-components=1 --no-same-owner \
+    && rm nodejs.tar.gz \
+    && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+RUN curl "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747.zip" -o /tmp/sonar-scanner.zip \
+  && unzip -d /opt /tmp/sonar-scanner.zip \
+  && mv /opt/sonar-scanner-4.7.0.2747 /opt/sonar-scanner \
+  && rm /tmp/sonar-scanner.zip
+
+USER sonarsource
+
+ENV PATH "/opt/sonar-scanner/bin:${PATH}"