From 10d2422c65523b0f762d85055cd4b79837c13b19 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Thu, 17 Aug 2023 19:10:58 +0200 Subject: [PATCH] Move to branch main as default branch --- README.md | 2 +- packages/duckdb-wasm-app/src/pages/versus.tsx | 6 +++--- packages/duckdb-wasm/test/httpfs_test.ts | 2 +- scripts/deploy_pages.sh | 4 ++-- scripts/reset_pages_subtree.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 89e0f2418..fb6aba2ce 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ duckdb-wasm package on NPM - Github Actions Badge + Github Actions Badge Join Discord diff --git a/packages/duckdb-wasm-app/src/pages/versus.tsx b/packages/duckdb-wasm-app/src/pages/versus.tsx index f7b94a2b0..a30668072 100644 --- a/packages/duckdb-wasm-app/src/pages/versus.tsx +++ b/packages/duckdb-wasm-app/src/pages/versus.tsx @@ -124,7 +124,7 @@ export const Versus: React.FC = (props: Props) => { here @@ -192,7 +192,7 @@ export const Versus: React.FC = (props: Props) => { here @@ -216,7 +216,7 @@ export const Versus: React.FC = (props: Props) => { non-trivial diff --git a/packages/duckdb-wasm/test/httpfs_test.ts b/packages/duckdb-wasm/test/httpfs_test.ts index e4af252c1..6a0762d13 100644 --- a/packages/duckdb-wasm/test/httpfs_test.ts +++ b/packages/duckdb-wasm/test/httpfs_test.ts @@ -251,7 +251,7 @@ export function testHTTPFSAsync( describe('HTTPFS Async', () => { it('can fetch https file', async () => { const results = await conn!.query( - `select * from "https://raw.githubusercontent.com/duckdb/duckdb-wasm/master/data/test.csv";`, + `select * from "https://raw.githubusercontent.com/duckdb/duckdb-wasm/main/data/test.csv";`, ); expect(BigInt(results.getChildAt(2)?.get(2))).toEqual(BigInt(9n)); }); diff --git a/scripts/deploy_pages.sh b/scripts/deploy_pages.sh index fa5b28630..372babcbe 100755 --- a/scripts/deploy_pages.sh +++ b/scripts/deploy_pages.sh @@ -11,8 +11,8 @@ if [ ! -d ${PAGES_DIR} ]; then git worktree add ${PAGES_DIR} origin/gh-pages fi -DEFAULT_BRANCH="master" -CURRENT_BRANCH=${1:-master} +DEFAULT_BRANCH="main" +CURRENT_BRANCH=${1:-main} cd ${PAGES_DIR} git fetch origin gh-pages diff --git a/scripts/reset_pages_subtree.sh b/scripts/reset_pages_subtree.sh index 3ab404137..bf6b173f2 100755 --- a/scripts/reset_pages_subtree.sh +++ b/scripts/reset_pages_subtree.sh @@ -11,8 +11,8 @@ if [ ! -d ${PAGES_DIR} ]; then git worktree add ${PAGES_DIR} origin/gh-pages fi -DEFAULT_BRANCH="master" -CURRENT_BRANCH=${1:-master} +DEFAULT_BRANCH="main" +CURRENT_BRANCH=${1:-main} cd ${PAGES_DIR} git fetch origin gh-pages