.drone.yml

@@ -4,27 +4,34 @@ type: docker
 name: default
 
 steps:
-  - name: build-wasm
-    image: emscripten/emsdk:3.0.0
-    commands:
-      - ./scripts/build-wasm.sh
-
   - name: build
     image: node:16.18-bullseye
     commands:
       - apt-get update
-      - apt-get install -y jq zip
+      - 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 artifact
+  - name: upload
-    image: node:16.18-bullseye
+    image: "plugins/s3"
-    environment:
+    settings:
-      DRONE_GITEA_SERVER: https://git.unlock-music.dev
+      path_style: true
-      GITEA_API_KEY:
+      endpoint:
-        from_secret: GITEA_API_KEY
+        from_secret: S3_ENDPOINT
-    commands:
+      access_key:
-      - ./scripts/upload-packages.sh
+        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}/"

scripts/upload-packages.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-cd "$(git rev-parse --show-toplevel)"
-
-if [ -z "$GITEA_API_KEY" ]; then
-  echo "GITEA_API_KEY is empty, skip upload."
-  exit 0
-fi
-
-URL_BASE="$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build"
-
-for ZIP_NAME in *.zip; do
-  UPLOAD_URL="${URL_BASE}/${DRONE_BUILD_NUMBER}/${ZIP_NAME}"
-  sha256sum "${ZIP_NAME}"
-  curl -sLifu "um-release-bot:$GITEA_API_KEY" -T "${ZIP_NAME}" "${UPLOAD_URL}"
-  echo "Uploaded to: ${UPLOAD_URL}"
-done

src/KgmWasm/build-wasm

@@ -11,20 +11,18 @@ if [ -z "$BUILD_TYPE" ]; then
 	BUILD_TYPE=Release
 fi
 
-# CI: already had emsdk installed.
+mkdir -p build/wasm
-if ! command -v emcc; then
+if [ ! -d ../../build/emsdk ]; then
-  if [ ! -d ../../build/emsdk ]; then
 	git clone https://github.com/emscripten-core/emsdk.git ../../build/emsdk
-  fi
-
-  pushd ../../build/emsdk
-  ./emsdk install 3.0.0
-  ./emsdk activate 3.0.0
-  source ./emsdk_env.sh
-  popd # ../../build/emsdk
 fi
 
-mkdir -p build/wasm
+pushd ../../build/emsdk
+#git pull
+./emsdk install 3.0.0
+./emsdk activate 3.0.0
+source ./emsdk_env.sh
+popd # ../../build/emsdk
+
 pushd build/wasm
 emcmake cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ../..
 make -j

src/QmcWasm/build-wasm

@@ -11,20 +11,17 @@ if [ -z "$BUILD_TYPE" ]; then
 	BUILD_TYPE=Release
 fi
 
-# CI: already had emsdk installed.
+mkdir -p build/wasm
-if ! command -v emcc; then
+if [ ! -d ../../build/emsdk ]; then
-  if [ ! -d ../../build/emsdk ]; then
 	git clone https://github.com/emscripten-core/emsdk.git ../../build/emsdk
-  fi
-
-  pushd ../../build/emsdk
-  ./emsdk install 3.0.0
-  ./emsdk activate 3.0.0
-  source ./emsdk_env.sh
-  popd # ../../build/emsdk
 fi
 
-mkdir -p build/wasm
+pushd ../../build/emsdk
+./emsdk install 3.0.0
+./emsdk activate 3.0.0
+source ./emsdk_env.sh
+popd # ../../build/emsdk
+
 pushd build/wasm
 emcmake cmake -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ../..
 make -j