From 2bc6e378b3ed496f8a45e978fab59f194e12a348 Mon Sep 17 00:00:00 2001 From: Rich Brown Date: Sun, 9 Jun 2024 08:00:20 -0400 Subject: [PATCH 1/3] Change out richb-hanover/cargo for clechasseur/rs-cargo@v2 to get Node 20 tests --- .github/actions/build-prqlc-c/action.yaml | 2 +- .github/actions/build-prqlc/action.yaml | 2 +- .github/actions/time-compilation/action.yaml | 2 +- .github/workflows/nightly.yaml | 6 +++--- .github/workflows/test-prqlc-c.yaml | 2 +- .github/workflows/test-rust.yaml | 12 ++++++------ 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/build-prqlc-c/action.yaml b/.github/actions/build-prqlc-c/action.yaml index f0dcbcbcf893..92fda68cdb8b 100644 --- a/.github/actions/build-prqlc-c/action.yaml +++ b/.github/actions/build-prqlc-c/action.yaml @@ -57,7 +57,7 @@ runs: echo 'CC=aarch64-linux-gnu-gcc' >>"$GITHUB_ENV" - name: cargo build - uses: richb-hanover/cargo@v1.1.0 + uses: clechasseur/rs-cargo@v2 with: command: build args: diff --git a/.github/actions/build-prqlc/action.yaml b/.github/actions/build-prqlc/action.yaml index b5aa98f7a811..316a4c2dea17 100644 --- a/.github/actions/build-prqlc/action.yaml +++ b/.github/actions/build-prqlc/action.yaml @@ -56,7 +56,7 @@ runs: echo 'CC=aarch64-linux-gnu-gcc' >>"$GITHUB_ENV" - name: cargo build - uses: richb-hanover/cargo@v1.1.0 + uses: clechasseur/rs-cargo@v2 with: command: build # We previously had `--package=prqlc` for all, but this caches much diff --git a/.github/actions/time-compilation/action.yaml b/.github/actions/time-compilation/action.yaml index b642d84dbadb..3d15692fdf09 100644 --- a/.github/actions/time-compilation/action.yaml +++ b/.github/actions/time-compilation/action.yaml @@ -25,7 +25,7 @@ runs: shell: bash run: rm -rf target/cargo-timings - name: 🏭 Compile - uses: richb-hanover/cargo@v1.1.0 + uses: clechasseur/rs-cargo@v2 with: command: build args: --timings --all-targets diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index f37920a66112..78fc8c45de84 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: richb-hanover/cargo@1.1.1 + - uses: clechasseur/rs-cargo@v2 with: command: bench args: --timings --all-targets @@ -100,11 +100,11 @@ jobs: crate: cargo-udeps # Once with all targets, once without, to find anything that should be in # `dev` but is more general. - - uses: richb-hanover/cargo@1.1.1 + - uses: clechasseur/rs-cargo@v2 with: command: udeps args: --all-targets - - uses: richb-hanover/cargo@1.1.1 + - uses: clechasseur/rs-cargo@v2 with: command: udeps diff --git a/.github/workflows/test-prqlc-c.yaml b/.github/workflows/test-prqlc-c.yaml index 5906d77bf5ff..e14607c00b8c 100644 --- a/.github/workflows/test-prqlc-c.yaml +++ b/.github/workflows/test-prqlc-c.yaml @@ -18,7 +18,7 @@ jobs: save-if: ${{ github.ref == 'refs/heads/main' }} shared-key: lib - name: Build - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: build # Currently requires a release build; would be useful to allow a debug build. diff --git a/.github/workflows/test-rust.yaml b/.github/workflows/test-rust.yaml index 92db357c585d..c832e584b4f9 100644 --- a/.github/workflows/test-rust.yaml +++ b/.github/workflows/test-rust.yaml @@ -86,7 +86,7 @@ jobs: # We split up the test compilation as recommended in # https://matklad.github.io/2021/09/04/fast-rust-builds.html - name: 🏭 Compile - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: test args: > @@ -99,7 +99,7 @@ jobs: timeout: 60000 if: ${{ contains(inputs.features, 'test-dbs-external') }} - name: πŸ“‹ Test - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: insta # Here, we also add: @@ -111,7 +111,7 @@ jobs: 'test-dbs') && inputs.target == 'x86_64-unknown-linux-gnu' && '--unreferenced=auto' || '' }} - name: πŸ“Ž Clippy - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: clippy # Note that `--all-targets` doesn't refer to targets like @@ -121,7 +121,7 @@ jobs: --all-targets --target=${{ inputs.target }} --no-default-features --features=${{ inputs.features }} -- -D warnings - name: ⌨️ Fmt - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: fmt args: --all --check @@ -130,7 +130,7 @@ jobs: # https://github.com/duckdb/duckdb-rs/issues/179#issuecomment-1710986020. if: inputs.nightly == 'true' && inputs.target != 'wasm32-unknown-unknown' - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: doc # Only run with deps on nightly, since it's much slower, and so farβ„’ @@ -145,7 +145,7 @@ jobs: if: ${{ github.ref == 'refs/heads/main' && steps.cache.outputs.cache-hit == 'false' }} - uses: richb-hanover/cargo@1.1.1 + uses: clechasseur/rs-cargo@v2 with: command: build args: From e20a54e899a492ba6bee45ec7c08d383a606004b Mon Sep 17 00:00:00 2001 From: Rich Brown Date: Sun, 9 Jun 2024 09:23:42 -0400 Subject: [PATCH 2/3] Change audit-check to version 1.4.1 (from "1") --- .github/workflows/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 78fc8c45de84..bf5dfce3de7d 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: rustsec/audit-check@v1 + - uses: rustsec/audit-check@v1.4.1 with: token: ${{ secrets.GITHUB_TOKEN }} # Only used in tests. Waiting for tiberius to publish a new release. From 9aed1ba9e1eda10eb4d6d3d1a0ca61dd2c4c196e Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 11 Jun 2024 23:45:07 +0000 Subject: [PATCH 3/3] fix: upgrade @testing-library/jest-dom from 6.4.0 to 6.4.5 Snyk has created this PR to upgrade @testing-library/jest-dom from 6.4.0 to 6.4.5. See this package in npm: @testing-library/jest-dom See this project in Snyk: https://app.snyk.io/org/richb-hanover/project/e0fe7ef4-f1e5-43c4-aed1-ae68c94e56e9?utm_source=github&utm_medium=referral&page=upgrade-pr --- web/playground/package-lock.json | 11 ++++++----- web/playground/package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/playground/package-lock.json b/web/playground/package-lock.json index a957022545d9..7ad60a33b90d 100644 --- a/web/playground/package-lock.json +++ b/web/playground/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@duckdb/duckdb-wasm": "^1.28.0", "@monaco-editor/react": "^4.6.0", - "@testing-library/jest-dom": "^6.4.0", + "@testing-library/jest-dom": "^6.4.5", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.5.0", "monaco-editor": "^0.49.0", @@ -2336,9 +2336,10 @@ } }, "node_modules/@testing-library/jest-dom": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.0.tgz", - "integrity": "sha512-GgGT3OR8qhIjk2SBMy51AYDWoMnAyR/cwjZO4SttuBmIQ9wWy9QmVOeaSbgT5Bm0J6qLBaf4+dsJWfisvafoaA==", + "version": "6.4.5", + "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.5.tgz", + "integrity": "sha512-AguB9yvTXmCnySBP1lWjfNNUwpbElsaQ567lt2VdGqAdHtpieLgjmcVyv1q7PMIvLbgpDdkWV5Ydv3FEejyp2A==", + "license": "MIT", "dependencies": { "@adobe/css-tools": "^4.3.2", "@babel/runtime": "^7.9.2", @@ -2346,7 +2347,7 @@ "chalk": "^3.0.0", "css.escape": "^1.5.1", "dom-accessibility-api": "^0.6.3", - "lodash": "^4.17.15", + "lodash": "^4.17.21", "redent": "^3.0.0" }, "engines": { diff --git a/web/playground/package.json b/web/playground/package.json index 3179485b0f0d..41d2857f5128 100644 --- a/web/playground/package.json +++ b/web/playground/package.json @@ -14,7 +14,7 @@ "dependencies": { "@duckdb/duckdb-wasm": "^1.28.0", "@monaco-editor/react": "^4.6.0", - "@testing-library/jest-dom": "^6.4.0", + "@testing-library/jest-dom": "^6.4.5", "@testing-library/react": "^16.0.0", "@testing-library/user-event": "^14.5.0", "monaco-editor": "^0.49.0",