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

Cherry-pick of dependabots commits, plus remove no more use dependency #1600

Merged
merged 8 commits into from
Jan 22, 2024
Merged

Cherry-pick of dependabots commits, plus remove no more use dependency #1600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ba0dc4
Remove boost
carlopi Jan 18, 2024
1643b2b
fix(deps): bump actions/cache from 3 to 4
dependabot[bot] Jan 22, 2024
a91bf84
fix(deps): bump mymindstorm/setup-emsdk from 13 to 14
dependabot[bot] Jan 22, 2024
9384315
fix(deps): bump classnames from 2.3.2 to 2.5.1
dependabot[bot] Jan 22, 2024
da17ed2
chore(deps-dev): bump copy-webpack-plugin from 11.0.0 to 12.0.2
dependabot[bot] Jan 22, 2024
08a13dd
chore(deps-dev): bump puppeteer from 21.6.1 to 21.7.0
dependabot[bot] Jan 22, 2024
5f1d2a2
fix(deps): bump react-router-dom from 6.21.2 to 6.21.3
dependabot[bot] Jan 22, 2024
f5599b5
chore(deps-dev): bump typedoc from 0.25.4 to 0.25.7
dependabot[bot] Jan 22, 2024
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
30 changes: 15 additions & 15 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
submodules: 'recursive'

- name: Cache node_modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./node_modules
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
submodules: 'recursive'

- name: Cache generator
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-generator
with:
path: ./submodules/tpch-dbgen/dbgen/dbgen
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
submodules: 'recursive'

- name: Cache rust build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.cargo/bin/
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
git submodule status ./submodules/duckdb > git_submodule_status.txt

- name: Cache ccache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.ccache
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
git submodule status > git_submodule_status.txt

- name: Cache native build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.cargo/bin/
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
git submodule status > git_submodule_status.txt

- name: Cache native build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.cargo/bin/
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
run: |
[ -f duckdb.patch ] && cd submodules/duckdb && git apply ../../duckdb.patch || echo "No patching needed"

- uses: mymindstorm/setup-emsdk@v13
- uses: mymindstorm/setup-emsdk@v14
with:
version: 'latest'

Expand Down Expand Up @@ -423,7 +423,7 @@ jobs:
run: |
[ -f duckdb.patch ] && cd submodules/duckdb && git apply ../../duckdb.patch || echo "No patching needed"

- uses: mymindstorm/setup-emsdk@v13
- uses: mymindstorm/setup-emsdk@v14
with:
version: 'latest'

Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
run: |
[ -f duckdb.patch ] && cd submodules/duckdb && git apply ../../duckdb.patch || echo "No patching needed"

- uses: mymindstorm/setup-emsdk@v13
- uses: mymindstorm/setup-emsdk@v14
with:
version: 'latest'

Expand Down Expand Up @@ -508,7 +508,7 @@ jobs:
run: |
[ -f duckdb.patch ] && cd submodules/duckdb && git apply ../../duckdb.patch || echo "No patching needed"

- uses: mymindstorm/setup-emsdk@v13
- uses: mymindstorm/setup-emsdk@v14
with:
version: 'latest'

Expand Down Expand Up @@ -552,7 +552,7 @@ jobs:
run: |
[ -f duckdb.patch ] && cd submodules/duckdb && git apply ../../duckdb.patch || echo "No patching needed"

- uses: mymindstorm/setup-emsdk@v13
- uses: mymindstorm/setup-emsdk@v14
with:
version: 'latest'

Expand Down Expand Up @@ -606,7 +606,7 @@ jobs:
git submodule status > git_submodule_status.txt

- name: Cache rust build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.cargo/bin/
Expand All @@ -619,7 +619,7 @@ jobs:
${{ runner.os }}-shell-

- name: Cache node_modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./node_modules
Expand Down Expand Up @@ -926,7 +926,7 @@ jobs:
git submodule status > git_submodule_status.txt

- name: Cache rust build
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.cargo/bin/
Expand All @@ -939,7 +939,7 @@ jobs:
${{ runner.os }}-shell-

- name: Cache node_modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./node_modules
Expand Down
2 changes: 0 additions & 2 deletions actions/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN apt-get update -qq \
bison flex \
brotli rsync \
libpthread-stubs0-dev \
libboost-all-dev \
chromium-browser \
wget gnupg ca-certificates procps libxss1 \
zip sqlite3 \
Expand Down Expand Up @@ -74,7 +73,6 @@ RUN source /opt/emsdk/emsdk_env.sh \
&& echo "export EM_CONFIG=/opt/emsdk/.emscripten" >> /opt/env.sh \
&& echo "export CARGO_HOME=/opt/rust" >> /opt/env.sh \
&& echo "export RUSTUP_HOME=/opt/rust" >> /opt/env.sh \
&& echo "export BOOST_ARCHIVE=/opt/boost.tar.gz" >> /opt/env.sh \
&& echo "source /opt/nvm/nvm.sh" >> /opt/env.sh \
&& cat /opt/env.sh \
&& printf '#!/bin/bash\nsource /opt/env.sh\nexec env "$@"\n' > /opt/entrypoint.sh \
Expand Down
1 change: 0 additions & 1 deletion lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ set(CMAKE_BUILD_PARALLEL_LEVEL ${NPROCS})
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})

include("${CMAKE_SOURCE_DIR}/cmake/duckdb.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/boost.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/arrow.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/benchmark.cmake")
include("${CMAKE_SOURCE_DIR}/cmake/gflags.cmake")
Expand Down
23 changes: 0 additions & 23 deletions lib/cmake/boost.cmake
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/duckdb-wasm-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@duckdb/duckdb-wasm-shell": "file:../duckdb-wasm-shell",
"apache-arrow": "^14.0.1",
"bootstrap": "^5.3.2",
"classnames": "^2.3.2",
"classnames": "^2.5.1",
"framer-motion": "^10.16.1",
"immutable": "^4.3.4",
"rc-scrollbars": "^1.1.6",
Expand All @@ -32,7 +32,7 @@
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-popper-tooltip": "^4.4.2",
"react-router-dom": "^6.21.2",
"react-router-dom": "^6.21.3",
"react-virtualized": "9.22.5",
"xterm": "^5.3.0",
"xterm-addon-fit": "^0.8.0",
Expand All @@ -46,7 +46,7 @@
"@types/react-dom": "^18.2.17",
"@types/react-router-dom": "^5.3.3",
"@types/react-virtualized": "^9.21.29",
"copy-webpack-plugin": "^11.0.0",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.8.1",
"eslint": "^8.56.0",
"eslint-plugin-jasmine": "^4.1.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/duckdb-wasm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"make-dir": "^4.0.0",
"nyc": "^15.1.0",
"prettier": "^3.2.2",
"puppeteer": "^21.6.1",
"puppeteer": "^21.7.0",
"rimraf": "^5.0.5",
"s3rver": "^3.7.1",
"typedoc": "^0.25.4",
"typedoc": "^0.25.7",
"typescript": "^5.3.3",
"wasm-feature-detect": "^1.6.1",
"web-worker": "^1.2.0"
Expand Down
Loading