Merge pull request '使用 DroneCI 自动构建' (#13) from ci/build-with-drone into master

Reviewed-on: #13

.drone.yml

@@ -0,0 +1,37 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: build
+    image: node:16.18-bullseye
+    commands:
+      - apt-get update
+      - apt-get install -y cmake jq zip
+      - ./scripts/build-wasm.sh
+      - npm ci
+      - npm run test
+      - ./scripts/build-and-package.sh legacy
+      - ./scripts/build-and-package.sh extension
+      - ./scripts/build-and-package.sh modern
+      - sha256sum *.zip > sha256sum.txt
+      - mkdir -p upload
+      - mv *.zip sha256sum.txt upload/
+
+  - name: upload
+    image: "plugins/s3"
+    settings:
+      path_style: true
+      endpoint:
+        from_secret: S3_ENDPOINT
+      access_key:
+        from_secret: S3_ACCESS_KEY
+      secret_key:
+        from_secret: S3_SECRET_KEY
+      bucket:
+        from_secret: S3_BUCKET
+      region: "auto"
+      source: "upload/*"
+      strip_prefix: "upload/"
+      target: "${DRONE_REPO}/${DRONE_BUILD_NUMBER}/"

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+/build
 /coverage
 
 # local env files
@@ -27,3 +28,7 @@ yarn-error.log*
 /src/QmcWasm/build
 /src/QmcWasm/*.js
 /src/QmcWasm/*.wasm
+
+*.zip
+*.tar.gz
+/sha256sum.txt

.nvmrc

@@ -0,0 +1 @@
+v16.18.1

README.md

@@ -44,8 +44,8 @@
 
 ### 自行构建
 
-#### JS部分
-
+#### JS部分
+
 - 环境要求
   - nodejs (v16.x)
   - npm
@@ -70,15 +70,15 @@
    ```sh
    npm run make-extension
    ```
-
-#### WASM部分
-
-- 环境要求
-  - Linux
-  - python3
-
-- 运行此目录下的build-wasm
-
-   ```sh
-   bash build-wasm
-   ```
+
+#### WASM部分
+
+- 环境要求
+  - Linux
+  - python3
+
+- 运行此目录下的build-wasm
+
+   ```sh
+   ./scripts/build-wasm.sh
+   ```

jest.config.js

@@ -1,8 +1,7 @@
-module.exports = {
-    setupFilesAfterEnv: [
-        './src/__test__/setup_jest.js'
-    ],
-    moduleNameMapper: {
-        '@/(.*)': '<rootDir>/src/$1'
-    }
-};
+module.exports = {
+  testPathIgnorePatterns: ['/build/', '/dist/', '/node_modules/'],
+  setupFilesAfterEnv: ['./src/__test__/setup_jest.js'],
+  moduleNameMapper: {
+    '@/(.*)': '<rootDir>/src/$1',
+  },
+};

make-extension.js

@@ -1,25 +1,25 @@
-const fs = require('fs')
-const path = require('path')
-const src = "./src/extension/"
-const dst = "./dist"
-fs.readdirSync(src).forEach(file => {
-    let srcPath = path.join(src, file)
-    let dstPath = path.join(dst, file)
-    fs.copyFileSync(srcPath, dstPath)
-    console.log(`Copy: ${srcPath} => ${dstPath}`)
-})
-
-const manifestRaw = fs.readFileSync("./extension-manifest.json", "utf-8")
-const manifest = JSON.parse(manifestRaw)
-
-const pkgRaw = fs.readFileSync("./package.json", "utf-8")
-const pkg = JSON.parse(pkgRaw)
-
-verExt = pkg["version"]
-if (verExt.startsWith("v")) verExt = verExt.slice(1)
-if (verExt.includes("-")) verExt = verExt.split("-")[0]
-manifest["version"] = `${verExt}.${pkg["ext_build"]}`
-manifest["version_name"] = pkg["version"]
-
-fs.writeFileSync("./dist/manifest.json", JSON.stringify(manifest), "utf-8")
-console.log("Write: manifest.json")
+const fs = require('fs')
+const path = require('path')
+const src = __dirname + "/src/extension/"
+const dst = __dirname + "/dist"
+fs.readdirSync(src).forEach(file => {
+    let srcPath = path.join(src, file)
+    let dstPath = path.join(dst, file)
+    fs.copyFileSync(srcPath, dstPath)
+    console.log(`Copy: ${srcPath} => ${dstPath}`)
+})
+
+const manifestRaw = fs.readFileSync(__dirname + "/extension-manifest.json", "utf-8")
+const manifest = JSON.parse(manifestRaw)
+
+const pkgRaw = fs.readFileSync(__dirname + "/package.json", "utf-8")
+const pkg = JSON.parse(pkgRaw)
+
+verExt = pkg["version"]
+if (verExt.startsWith("v")) verExt = verExt.slice(1)
+if (verExt.includes("-")) verExt = verExt.split("-")[0]
+manifest["version"] = `${verExt}.${pkg["ext_build"]}`
+manifest["version_name"] = pkg["version"]
+
+fs.writeFileSync(__dirname + "/dist/manifest.json", JSON.stringify(manifest), "utf-8")
+console.log("Write: manifest.json")

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unlock-music",
-  "version": "v1.10.3",
+  "version": "1.10.3",
   "ext_build": 0,
   "updateInfo": "完善音乐标签编辑功能，支持编辑更多标签",
   "license": "MIT",
@@ -56,4 +56,4 @@
     "vue-cli-plugin-element": "^1.0.1",
     "vue-template-compiler": "^2.6.14"
   }
-}
+}

scripts/build-and-package.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -ex
+
+cd "$(git rev-parse --show-toplevel)"
+
+VERSION="$(jq -r ".version" <package.json)"
+DIST_NAME="um-web.$1.v${VERSION}"
+
+case "$1" in
+"modern") npm run build -- --modern ;;
+"legacy") npm run build ;;
+"extension") npm run make-extension ;;
+
+*)
+  echo "Unknown command: $1"
+  exit 1
+  ;;
+esac
+
+mv dist "${DIST_NAME}"
+zip -rJ9 "${DIST_NAME}.zip" "${DIST_NAME}"
+
+if [ "$1" = "legacy" ]; then
+  # For upcoming extension build
+  mv "${DIST_NAME}" dist
+else
+  rm -rf "${DIST_NAME}"
+fi

scripts/build-wasm.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
+
+cd "$(git rev-parse --show-toplevel)"
 
 pushd ./src/QmcWasm
 bash build-wasm

src/KgmWasm/build-wasm

@@ -12,16 +12,16 @@ if [ -z "$BUILD_TYPE" ]; then
 fi
 
 mkdir -p build/wasm
-if [ ! -d build/emsdk ]; then
-	git clone https://github.com/emscripten-core/emsdk.git build/emsdk
+if [ ! -d ../../build/emsdk ]; then
+	git clone https://github.com/emscripten-core/emsdk.git ../../build/emsdk
 fi
 
-pushd build/emsdk
+pushd ../../build/emsdk
 #git pull
 ./emsdk install 3.0.0
 ./emsdk activate 3.0.0
 source ./emsdk_env.sh
-popd # build/emsdk
+popd # ../../build/emsdk
 
 pushd build/wasm
 emcmake cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ../..
@@ -33,8 +33,6 @@ TARGET_FILES="
 	KgmWasmBundle.js
 "
 
-#mkdir -p "${CURR_DIR}/npm"
-#cp $TARGET_FILES "${CURR_DIR}/npm/"
 cp $TARGET_FILES "${CURR_DIR}/"
 popd # build/wasm
 

src/QmcWasm/build-wasm

@@ -12,16 +12,15 @@ if [ -z "$BUILD_TYPE" ]; then
 fi
 
 mkdir -p build/wasm
-if [ ! -d build/emsdk ]; then
-	git clone https://github.com/emscripten-core/emsdk.git build/emsdk
+if [ ! -d ../../build/emsdk ]; then
+	git clone https://github.com/emscripten-core/emsdk.git ../../build/emsdk
 fi
 
-pushd build/emsdk
-#git pull
+pushd ../../build/emsdk
 ./emsdk install 3.0.0
 ./emsdk activate 3.0.0
 source ./emsdk_env.sh
-popd # build/emsdk
+popd # ../../build/emsdk
 
 pushd build/wasm
 emcmake cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ../..
@@ -33,8 +32,6 @@ TARGET_FILES="
 	QmcWasmBundle.js
 "
 
-#mkdir -p "${CURR_DIR}/npm"
-#cp $TARGET_FILES "${CURR_DIR}/npm/"
 cp $TARGET_FILES "${CURR_DIR}/"
 popd # build/wasm
 

src/decrypt/__test__/QmcCache.test.ts

@@ -1,20 +0,0 @@
-// import { DecryptBuffer as DecryptQmcCacheBuffer } from '../qmccache';
-// import fs from 'fs';
-//
-// const expectedBuffer = fs.readFileSync(__dirname + '/fixture/qmc_cache_expected.bin');
-//
-// const createInputBuffer = () => {
-//   const buffer = Buffer.alloc(256);
-//   for (let i = buffer.byteLength; i >= 0; i--) {
-//     buffer[i] = i;
-//   }
-//   return buffer;
-// };
-//
-// describe('decrypt/qmccache', () => {
-//   it('should decrypt specified buffer correctly', () => {
-//     const input = createInputBuffer();
-//     DecryptQmcCacheBuffer(input);
-//     expect(input).toEqual(expectedBuffer);
-//   });
-// });