Merge remote-tracking branch 'origin/drone-ci' into drone-ci-dess

diff --git a/.drone.yml b/.drone.yml
new file mode 100644 (file)
index 0000000..1181210
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,75 @@
+---
+kind: pipeline
+name: amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+  - name: fetch git submodules
+    image: node:14-alpine
+    commands:
+      - apk add git
+      - git submodule init
+      - git submodule update --recursive --remote
+
+  - name: yarn
+    image: node:14-alpine
+    commands:
+      - yarn
+
+  - name: yarn lint
+    image: node:14-alpine
+    commands:
+      - yarn lint
+
+  - name: yarn build:dev
+    image: node:14-alpine
+    commands:
+      - yarn build:dev
+
+  - name: create docker tags
+    image: node:14-alpine
+    commands:
+      - echo "$(git describe),latest" > .tags
+    when:
+      ref:
+        - refs/tags/*
+
+  - name: try to make a build
+    image: plugins/docker
+    settings:
+      dockerfile: Dockerfile
+      repo: dessalines/lemmy-ui
+    when:
+      ref:
+        - refs/tags/*
+
+---
+kind: pipeline
+name: arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+
+  - name: create docker tags
+    image: node:14-alpine
+    commands:
+      - echo "$(git describe),latest" > .tags
+    when:
+      ref:
+        - refs/tags/*
+
+  - name: try to make a build
+    image: plugins/docker
+    settings:
+      dockerfile: Dockerfile
+      repo: dessalines/lemmy-ui
+    #when:
+    #  ref:
+    #    - refs/tags/*
\ No newline at end of file

diff --git a/package.json b/package.json
index 9296b26e8a8beec8f94b8fd59dd6b5ec75957e26..188e9ddcfa486486da7254bc1dba8c9ba2258ede 100644 (file)
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "build:prod": "webpack --mode=production",
     "clean": "yarn run rimraf dist",
     "dev": "yarn start",
-    "lint": "tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
+    "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src",
     "prebuild:dev": "yarn clean && node generate_translations.js",
     "prebuild:prod": "yarn clean && node generate_translations.js",
     "start": "yarn build:dev --watch"