Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to main as default branch #1369

Merged
merged 2 commits into from
Aug 21, 2023
Merged

Move to main as default branch #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdb1e85
Fix workflow to work after move to 'main'
carlopi Aug 17, 2023
10d2422
Move to branch main as default branch
carlopi Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- '**'
- '!master'
- '!main'
tags:
- '**'
pull_request:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |-
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |-
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |-
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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: |-
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<img src="https://img.shields.io/npm/v/@duckdb/duckdb-wasm?logo=npm" alt="duckdb-wasm package on NPM">
</a>
<a href="https://github.com/duckdb/duckdb-wasm/actions">
<img src="https://github.com/duckdb/duckdb-wasm/actions/workflows/main.yml/badge.svg?branch=master" alt="Github Actions Badge">
<img src="https://github.com/duckdb/duckdb-wasm/actions/workflows/main.yml/badge.svg?branch=main" alt="Github Actions Badge">
</a>
<a href="https://discord.duckdb.org">
<img src="https://shields.io/discord/909674491309850675" alt="Join Discord" />
Expand Down
6 changes: 3 additions & 3 deletions packages/duckdb-wasm-app/src/pages/versus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export const Versus: React.FC<Props> = (props: Props) => {
<a
className={styles.link}
target="_blank"
href="https://github.com/duckdb/duckdb-wasm/tree/master/packages/benchmarks"
href="https://github.com/duckdb/duckdb-wasm/tree/main/packages/benchmarks"
rel="noreferrer"
>
here
Expand Down Expand Up @@ -192,7 +192,7 @@ export const Versus: React.FC<Props> = (props: Props) => {
<a
className={styles.link}
target="_blank"
href="https://github.com/duckdb/duckdb/blob/master/tools/rest/frontend/images/tpch-schema.png"
href="https://github.com/duckdb/duckdb/blob/main/tools/rest/frontend/images/tpch-schema.png"
rel="noreferrer"
>
here
Expand All @@ -216,7 +216,7 @@ export const Versus: React.FC<Props> = (props: Props) => {
<a
className={styles.link}
target="_blank"
href="https://github.com/duckdb/duckdb-wasm/blob/master/packages/benchmarks/src/system/arquero_benchmarks.ts"
href="https://github.com/duckdb/duckdb-wasm/blob/main/packages/benchmarks/src/system/arquero_benchmarks.ts"
rel="noreferrer"
>
non-trivial
Expand Down
2 changes: 1 addition & 1 deletion packages/duckdb-wasm/test/httpfs_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
});
Expand Down
4 changes: 2 additions & 2 deletions scripts/deploy_pages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/reset_pages_subtree.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading