Compare commits

..

No commits in common. "49b31301cf417a4fc1359da6a238b951448a4f67" and "e569719f97f67e32829df21bc8d9213ca0251d43" have entirely different histories.

10 changed files with 81 additions and 115 deletions

View File

@ -1,31 +0,0 @@
---
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 modern
- ./scripts/build-and-package.sh legacy
- ./scripts/build-and-package.sh extension
- sha256sum *.zip > sha256sum.txt
- name: upload
image: plugins/s3
settings:
bucket: um-web
access_key:
from_secret: S3_ACCESS_KEY
secret_key:
from_secret: S3_SECRET_KEY
source: |
*.zip
sha256sum.txt
target: /${DRONE_COMMIT_BRANCH}-latest

4
.gitignore vendored
View File

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

View File

@ -80,5 +80,5 @@
- 运行此目录下的build-wasm
```sh
./scripts/build-wasm.sh
bash build-wasm
```

View File

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

View File

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

View File

@ -1,7 +1,7 @@
const fs = require('fs')
const path = require('path')
const src = __dirname + "/src/extension/"
const dst = __dirname + "/dist"
const src = "./src/extension/"
const dst = "./dist"
fs.readdirSync(src).forEach(file => {
let srcPath = path.join(src, file)
let dstPath = path.join(dst, file)
@ -9,10 +9,10 @@ fs.readdirSync(src).forEach(file => {
console.log(`Copy: ${srcPath} => ${dstPath}`)
})
const manifestRaw = fs.readFileSync(__dirname + "/extension-manifest.json", "utf-8")
const manifestRaw = fs.readFileSync("./extension-manifest.json", "utf-8")
const manifest = JSON.parse(manifestRaw)
const pkgRaw = fs.readFileSync(__dirname + "/package.json", "utf-8")
const pkgRaw = fs.readFileSync("./package.json", "utf-8")
const pkg = JSON.parse(pkgRaw)
verExt = pkg["version"]
@ -21,5 +21,5 @@ 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")
fs.writeFileSync("./dist/manifest.json", JSON.stringify(manifest), "utf-8")
console.log("Write: manifest.json")

View File

@ -1,23 +0,0 @@
#!/bin/sh
set -ex
cd "$(git rev-parse --show-toplevel)"
VERSION="$(jq -r ".version" <package.json)"
DIST_NAME="um-web.$1.${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}"
rm -rf "${DIST_NAME}"

View File

@ -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,6 +33,8 @@ TARGET_FILES="
KgmWasmBundle.js
"
#mkdir -p "${CURR_DIR}/npm"
#cp $TARGET_FILES "${CURR_DIR}/npm/"
cp $TARGET_FILES "${CURR_DIR}/"
popd # build/wasm

View File

@ -12,15 +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" ../..
@ -32,6 +33,8 @@ TARGET_FILES="
QmcWasmBundle.js
"
#mkdir -p "${CURR_DIR}/npm"
#cp $TARGET_FILES "${CURR_DIR}/npm/"
cp $TARGET_FILES "${CURR_DIR}/"
popd # build/wasm

View File

@ -0,0 +1,20 @@
// 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);
// });
// });