Tweaks for braintrust

braintrustdata · Oct 27, 2023 · 0f55819 · 0f55819
1 parent f955138
commit 0f55819
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,6 +15,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/main' || github.sha }}
   cancel-in-progress: true
 
+env:
+    DUCKDB_JSON: 1
+
 jobs:
     clang_format:
         name: Clang-Format
@@ -239,6 +242,8 @@ jobs:
               uses: duckdb/duckdb-wasm-ci-env@ae43fa250a6b6ba92fe3d825c6c34b6d68a258a0
               with:
                   script: |-
+                      mkdir -p ./.ccache/extension
+                      touch ./.ccache/extension/json
                       cmake \
                           -S./lib/ \
                           -B./lib/build/debug \
@@ -335,6 +340,8 @@ jobs:
               uses: duckdb/duckdb-wasm-ci-env@ae43fa250a6b6ba92fe3d825c6c34b6d68a258a0
               with:
                   script: |-
+                      mkdir -p ./.ccache/extension
+                      touch ./.ccache/extension/json
                       cmake \
                           -S./lib/ \
                           -B./lib/build/release \
@@ -749,8 +756,8 @@ jobs:
               if: env.NODE_AUTH_TOKEN != null && (startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch')
               run: |
                   ./scripts/npm_publish_lib.sh
-                  ./scripts/npm_publish_shell.sh
-                  ./scripts/npm_publish_react.sh
+                  # ./scripts/npm_publish_shell.sh
+                  # ./scripts/npm_publish_react.sh
 
             - name: Build @duckdb/benchmarks
               shell: bash

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -275,11 +275,9 @@ if(EXISTS "${EXCEL_EXTENSION_CACHE_FILE}")
   set(DUCKDB_WEB_EXCEL "duckdb_web_excel")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDUCKDB_EXCEL_EXTENSION")
 endif()
-set(DUCKDB_WEB_JSON "")
-if(EXISTS "${JSON_EXTENSION_CACHE_FILE}")
-  set(DUCKDB_WEB_JSON "duckdb_web_json")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDUCKDB_JSON_EXTENSION")
-endif()
+
+set(DUCKDB_WEB_JSON "duckdb_web_json")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDUCKDB_JSON_EXTENSION")
 
 target_link_libraries(duckdb_web duckdb duckdb_web_fts duckdb_web_parquet ${DUCKDB_WEB_EXCEL} ${DUCKDB_WEB_JSON} arrow rapidjson ${THREAD_LIBS})
 target_link_libraries(duckdb_web_fts duckdb duckdb_fts)

diff --git a/packages/duckdb-wasm/package.json b/packages/duckdb-wasm/package.json
@@ -1,11 +1,11 @@
 {
     "name": "@duckdb/duckdb-wasm",
-    "version": "1.11.0",
+    "version": "0.0.3",
     "description": "DuckDB powered by WebAssembly",
     "license": "MIT",
     "repository": {
         "type": "git",
-        "url": "https://github.com/duckdb/duckdb-wasm.git"
+        "url": "https://github.com/braintrustdata/duckdb-wasm.git"
     },
     "keywords": [
         "sql",

diff --git a/scripts/npm_publish_lib.sh b/scripts/npm_publish_lib.sh
@@ -3,6 +3,7 @@
 PROJECT_ROOT="$(cd $(dirname "$BASH_SOURCE[0]") && cd .. && pwd)" &> /dev/null
 
 cd ${PROJECT_ROOT}/packages/duckdb-wasm
+python3 -c "import os; import json; p = json.load(open('package.json')); p['name'] = '@braintrust/duckdb-wasm'; json.dump(p, open('package.json', 'w'), indent=2, ensure_ascii=False);"
 mkdir -p ./dist/img
 cp ${PROJECT_ROOT}/misc/duckdb.svg ./dist/img/duckdb.svg
 cp ${PROJECT_ROOT}/misc/duckdb_wasm.svg ./dist/img/duckdb_wasm.svg