diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 062aa3336..339b16cf6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
branches:
- '**'
- '!master'
+ - '!main'
tags:
- '**'
pull_request:
@@ -13,7 +14,7 @@ on:
workflow_dispatch:
concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ github.ref != 'refs/heads/master' || github.sha }}
+ group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}-${{ (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main') || github.sha }}
cancel-in-progress: true
jobs:
@@ -669,7 +670,7 @@ jobs:
./scripts/npm_publish_react.sh
- name: Deploy GitHub Page
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
run: |
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
git fetch origin gh-pages
@@ -701,7 +702,7 @@ jobs:
retention-days: 1
- name: Preparation TPCH 0.01
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: duckdb/duckdb-wasm-ci-env@v0.11
with:
script: |-
@@ -714,7 +715,7 @@ jobs:
./scripts/generate_tpch_sqlite.sh 0.01
- name: Benchmarks TPCH 0.01
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
shell: bash
run: |
yarn workspace @duckdb/benchmarks bench:system:tpch:duckdb 0.01
@@ -723,7 +724,7 @@ jobs:
yarn workspace @duckdb/benchmarks bench:system:tpch:lovefield 0.01
- name: Upload reports TPCH 0.01
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: actions/upload-artifact@v3
with:
name: reports_tpch_0_01
@@ -735,7 +736,7 @@ jobs:
retention-days: 1
- name: Preparation TPCH 0.1
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: duckdb/duckdb-wasm-ci-env@v0.11
with:
script: |-
@@ -748,7 +749,7 @@ jobs:
./scripts/generate_tpch_sqlite.sh 0.1
- name: Benchmarks TPCH 0.1
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
shell: bash
run: |
yarn workspace @duckdb/benchmarks bench:system:tpch:duckdb 0.1
@@ -757,7 +758,7 @@ jobs:
yarn workspace @duckdb/benchmarks bench:system:tpch:lovefield 0.1
- name: Upload reports TPCH 0.1
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: actions/upload-artifact@v3
with:
name: reports_tpch_0_1
@@ -769,7 +770,7 @@ jobs:
retention-days: 1
- name: Preparation TPCH 0.25
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: duckdb/duckdb-wasm-ci-env@v0.11
with:
script: |-
@@ -782,7 +783,7 @@ jobs:
./scripts/generate_tpch_sqlite.sh 0.25
- name: Benchmarks TPCH 0.25
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
shell: bash
run: |
yarn workspace @duckdb/benchmarks bench:system:tpch:duckdb 0.25
@@ -791,7 +792,7 @@ jobs:
yarn workspace @duckdb/benchmarks bench:system:tpch:lovefield 0.25
- name: Upload reports TPCH 0.25
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: actions/upload-artifact@v3
with:
name: reports_tpch_0_25
@@ -803,7 +804,7 @@ jobs:
retention-days: 1
- name: Preparation TPCH 0.5
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: duckdb/duckdb-wasm-ci-env@v0.11
with:
script: |-
@@ -816,7 +817,7 @@ jobs:
./scripts/generate_tpch_sqlite.sh 0.5
- name: Benchmarks TPCH 0.5
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
shell: bash
run: |
yarn workspace @duckdb/benchmarks bench:system:tpch:duckdb 0.5
@@ -825,7 +826,7 @@ jobs:
yarn workspace @duckdb/benchmarks bench:system:tpch:lovefield 0.5
- name: Upload reports TPCH 0.5
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
uses: actions/upload-artifact@v3
with:
name: reports_tpch_0_5
@@ -839,7 +840,7 @@ jobs:
merge_reports:
name: Merge benchmark reports
runs-on: ubuntu-latest
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
needs:
- js_libs
steps:
@@ -913,7 +914,7 @@ jobs:
retention-days: 1
- name: Deploy benchmark reports
- if: github.ref == 'refs/heads/master'
+ if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads.main'
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
diff --git a/README.md b/README.md
index 89e0f2418..fb6aba2ce 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
-
+
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