Fix CI build scripts (pt. 2)

Fix CI build scripts, update caniuse database
2025-04-21 03:06:47 +00:00 · 2023-07-13 16:29:30 -04:00 · 2023-07-13 16:23:04 -04:00
7 changed files with 4341 additions and 3928 deletions
--- a/6
+++ b/6
@ -1,11 +1,6 @@
 FROM simon987/sist2-build as build
 MAINTAINER simon987 <me@simon987.net>

-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-RUN apt update -y; apt install -y nodejs && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /build/

 COPY scripts scripts
@ -25,7 +20,6 @@ RUN strip build/sist2 || mv build/sist2_debug build/sist2

 FROM --platform="linux/amd64" ubuntu@sha256:965fbcae990b0467ed5657caceaec165018ef44a4d2d46c7cdea80a9dff0d1ea

-
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@ -1,11 +1,6 @@
 FROM simon987/sist2-build-arm64 as build
 MAINTAINER simon987 <me@simon987.net>

-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash
-RUN apt update -y; apt install -y nodejs && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /build/

 COPY scripts scripts
--- a/scripts/build.sh
+++ b/scripts/build.sh
@ -4,6 +4,18 @@ VCPKG_ROOT="/vcpkg"

 git submodule update --init --recursive

+(
+  cd sist2-vue/
+  npm install
+  npm run build
+)
+
+(
+  cd sist2-admin/frontend/
+  npm install
+  npm run build
+)
+
 mkdir build
 (
  cd build
--- a/scripts/build_arm64.sh
+++ b/scripts/build_arm64.sh
@ -4,6 +4,18 @@ VCPKG_ROOT="/vcpkg"

 git submodule update --init --recursive

+(
+  cd sist2-vue/
+  npm install
+  npm run build
+)
+
+(
+  cd sist2-admin/frontend/
+  npm install
+  npm run build
+)
+
 mkdir build
 (
  cd build
--- a/sist2-admin/frontend/package-lock.json
+++ b/sist2-admin/frontend/package-lock.json
@ -3794,9 +3794,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001436",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
-      "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==",
+      "version": "1.0.30001515",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz",
+      "integrity": "sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==",
      "dev": true,
      "funding": [
        {
@ -3806,6 +3806,10 @@
        {
          "type": "tidelift",
          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
        }
      ]
    },
@ -13680,9 +13684,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001436",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz",
-      "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==",
+      "version": "1.0.30001515",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz",
+      "integrity": "sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==",
      "dev": true
    },
    "case-sensitive-paths-webpack-plugin": {
--- a/sist2-admin/frontend/yarn.lock
+++ b/sist2-admin/frontend/yarn.lock
--- a/sist2-vue/package-lock.json
+++ b/sist2-vue/package-lock.json
@ -4548,9 +4548,9 @@
      }
    },
    "node_modules/caniuse-lite": {
-      "version": "1.0.30001444",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001444.tgz",
-      "integrity": "sha512-ecER9xgJQVMqcrxThKptsW0pPxSae8R2RB87LNa+ivW9ppNWRHEplXcDzkCOP4LYWGj8hunXLqaiC41iBATNyg==",
+      "version": "1.0.30001515",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz",
+      "integrity": "sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==",
      "dev": true,
      "funding": [
        {
@ -4560,6 +4560,10 @@
        {
          "type": "tidelift",
          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
        }
      ]
    },
@ -15422,9 +15426,9 @@
      }
    },
    "caniuse-lite": {
-      "version": "1.0.30001444",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001444.tgz",
-      "integrity": "sha512-ecER9xgJQVMqcrxThKptsW0pPxSae8R2RB87LNa+ivW9ppNWRHEplXcDzkCOP4LYWGj8hunXLqaiC41iBATNyg==",
+      "version": "1.0.30001515",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz",
+      "integrity": "sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA==",
      "dev": true
    },
    "case-sensitive-paths-webpack-plugin": {
Author	SHA1	Message	Date
simon987	6225cf81de	Fix CI build scripts (pt. 2)	2023-07-13 16:29:30 -04:00
simon987	d7058ab645	Fix CI build scripts, update caniuse database	2023-07-13 16:23:04 -04:00