diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml index d2c6ae3f..931a600e 100644 --- a/.github/workflows/node.yaml +++ b/.github/workflows/node.yaml @@ -174,12 +174,15 @@ jobs: run: yarn install --immutable --mode=skip-build - name: Build in docker - uses: addnab/docker-run-action@v3 if: ${{ matrix.settings.docker }} - with: - image: ${{ matrix.settings.docker }} - options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/.cargo/git:/usr/local/cargo/git -v ${{ github.workspace }}/.cargo-cache/.cargo/registry:/usr/local/cargo/registry -v ${{ github.workspace }}:/build -w /build - run: ${{ matrix.settings.build }} + run: | + docker run --rm --user 0:0 \ + -v ${{ github.workspace }}/.cargo-cache/.cargo/git:/usr/local/cargo/git \ + -v ${{ github.workspace }}/.cargo-cache/.cargo/registry:/usr/local/cargo/registry \ + -v ${{ github.workspace }}:/build \ + -w /build \ + ${{ matrix.settings.docker }} \ + bash -c "${{ matrix.settings.build }}" - name: 'Build' run: ${{ matrix.settings.build }} @@ -315,15 +318,11 @@ jobs: shell: bash - name: Test bindings - uses: addnab/docker-run-action@v3 - with: - image: node:${{ matrix.node }}-slim - options: -v ${{ github.workspace }}:/workspace - run: | - cd workspace/bindings/nodejs - yarn install - yarn link - yarn test + run: | + docker run --rm \ + -v ${{ github.workspace }}:/workspace \ + node:${{ matrix.node }}-slim \ + bash -c "cd workspace/bindings/nodejs && yarn install && yarn link && yarn test" test-linux-x64-musl-binding: name: Test bindings on Linux-x64-musl - node@${{ matrix.node }} needs: @@ -370,15 +369,11 @@ jobs: shell: bash - name: Test bindings - uses: addnab/docker-run-action@v3 - with: - image: node:${{ matrix.node }}-alpine - options: -v ${{ github.workspace }}:/workspace - run: | - cd workspace/bindings/nodejs - yarn install - yarn link - yarn test + run: | + docker run --rm \ + -v ${{ github.workspace }}:/workspace \ + node:${{ matrix.node }}-alpine \ + sh -c "cd workspace/bindings/nodejs && yarn install && yarn link && yarn test" test-linux-aarch64-musl-binding: name: Test bindings on Linux-aarch64-musl - node@${{ matrix.node }} needs: @@ -432,15 +427,11 @@ jobs: shell: bash - name: Test bindings - uses: addnab/docker-run-action@v3 - with: - options: --platform linux/arm64 -v ${{ github.workspace }}:/workspace - image: node:${{ matrix.node }}-alpine - run: | - cd workspace/bindings/nodejs - yarn install - yarn link - yarn test + run: | + docker run --rm --platform linux/arm64 \ + -v ${{ github.workspace }}:/workspace \ + node:${{ matrix.node }}-alpine \ + sh -c "cd workspace/bindings/nodejs && yarn install && yarn link && yarn test" # test-linux-aarch64-gnu-binding: # name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} # needs: diff --git a/core/types/src/rcvalue/conv.rs b/core/types/src/rcvalue/conv.rs index ab6ffda1..7f476510 100644 --- a/core/types/src/rcvalue/conv.rs +++ b/core/types/src/rcvalue/conv.rs @@ -1,8 +1,8 @@ use crate::rcvalue::RcValue; use crate::variable::{ToVariable, Variable}; +use rust_decimal::Decimal; #[cfg(not(feature = "arbitrary_precision"))] use rust_decimal::prelude::FromPrimitive; -use rust_decimal::Decimal; use serde_json::Value; use std::rc::Rc; diff --git a/core/types/src/variable/conv.rs b/core/types/src/variable/conv.rs index f125d13e..747e73a7 100644 --- a/core/types/src/variable/conv.rs +++ b/core/types/src/variable/conv.rs @@ -1,7 +1,7 @@ use crate::variable::Variable; +use rust_decimal::Decimal; #[cfg(not(feature = "arbitrary_precision"))] use rust_decimal::prelude::FromPrimitive; -use rust_decimal::Decimal; use serde_json::{Number, Value}; use std::rc::Rc; #[cfg(not(feature = "arbitrary_precision"))]