fix ci

1 year ago · 78f8c35b03
parent 3beff7e972
commit 78f8c35b03
6 changed files with 39 additions and 43 deletions
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@ -1,6 +1,6 @@
 module.exports = {
    root: true,
-    env: { browser: true, es2023: true },
+    env: { browser: true, es2021: true },
    extends: [
        "eslint:recommended",
        "plugin:@typescript-eslint/recommended",
--- a/ci/.drone.yml
+++ b/ci/.drone.yml
@ -3,45 +3,40 @@ type: docker
 name: "CI and Deploy on maxou.dev"
 volumes:
-    - name: server
+  - name: server
-      temp: {}
+    temp: { }
 trigger:
-    event:
+  event:
-        - push
+    - push
 steps:
-    - image: node:latest
+  - image: node:latest
-      name: "front CI"
+    name: "front CI"
-      commands:
+    commands:
-          - npm install
+      - npm install
-          - npm run tsc
+      - npm run tsc
-#  - image: node:latest
+
-#    name: "build node"
+  - image: node:latest
-#    volumes: &outputs
+    name: "build react"
-#      - name: server
+    volumes: &outputs
-#        path: /outputs
+      - name: server
-#    depends_on:
+        path: /outputs
-#      - "front CI"
+    depends_on:
-#    commands:
+      - "front CI"
-#      - curl -L moshell.dev/setup.sh > /tmp/moshell_setup.sh
+    commands:
-#      - chmod +x /tmp/moshell_setup.sh
+      - npm run build -- --base=/$DRONE_BRANCH
-#      - echo n | /tmp/moshell_setup.sh
+      - mv dist/* /outputs
-#      - echo "VITE_API_ENDPOINT=/IQBall/$DRONE_BRANCH/public/api" >> .env.PROD
+
-#      - echo "VITE_BASE=/IQBall/$DRONE_BRANCH/public" >> .env.PROD
+
-#      - apt update && apt install jq -y
+  - image: eeacms/rsync:latest
-#      -
+    name: Deliver on staging server branch
-#      - BASE="/IQBall/$DRONE_BRANCH/public" OUTPUT=/outputs /root/.local/bin/moshell ci/build_react.msh
+    depends_on:
-##
+      - "build react"
-#  - image: eeacms/rsync:latest
+    volumes: *outputs
-#    name: Deliver on staging server branch
+    environment:
-#    depends_on:
+      SERVER_PRIVATE_KEY:
-#      - "prepare php"
+        from_secret: SERVER_PRIVATE_KEY
-#      - "build node"
+    commands:
-#    volumes: *outputs
+      - chmod +x ci/deploy.sh
-#    environment:
+      - ci/deploy.sh
 #      SERVER_PRIVATE_KEY:
 #        from_secret: SERVER_PRIVATE_KEY
 #    commands:
 #        - chmod +x ci/deploy.sh
 #        - ci/deploy.sh
--- a/ci/build_and_deploy_to.sh
+++ b/ci/build_and_deploy_to.sh
@ -1,8 +1,9 @@
 set -e
 export OUTPUT=$1
 export BASE=$2
-rm -rf $OUTPUT/*
+rm -rf "$OUTPUT"/*
 echo "VITE_API_ENDPOINT=$BASE/api" >> .env.PROD
 echo "VITE_BASE=$BASE" >> .env.PROD
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@ -5,7 +5,7 @@ echo "$SERVER_PRIVATE_KEY" > ~/.ssh/id_rsa
 chmod 0600 ~/.ssh
 chmod 0500 ~/.ssh/id_rsa*
-SERVER_ROOT=/srv/www/IQBall
+SERVER_ROOT=/srv/www/iqball
 ssh -p 80 -o 'StrictHostKeyChecking=no' iqball@maxou.dev mkdir -p $SERVER_ROOT/$DRONE_BRANCH
 rsync -avz -e "ssh -p 80 -o 'StrictHostKeyChecking=no'" --delete /outputs/* iqball@maxou.dev:$SERVER_ROOT/$DRONE_BRANCH
--- a/index.html
+++ b/index.html
@ -4,7 +4,7 @@
        <meta charset="UTF-8" />
        <link rel="icon" type="image/svg+xml" href="/src/assets/vite.svg" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Vite + React + TS</title>
+        <title>IQBall</title>
    </head>
    <body>
        <div id="root"></div>
--- a/vite.config.ts
+++ b/vite.config.ts
@ -6,7 +6,7 @@ import svgr from "vite-plugin-svgr"
 // https://vitejs.dev/config/
 export default defineConfig({
    build: {
-        target: "es2023",
+        target: "es2021",
    },
    plugins: [
        react(),