commit fa0e9c76d08010a438a162814c3765e6c2cf0e43
parent 8cd8b00ddf5038beeda838180535850a498255cc
Author: MTRNord <mtrnord1@gmail.com>
Date: Sat, 30 Sep 2023 19:08:42 +0200
There is no reason to use docker
Diffstat:
1 file changed, 7 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -40,7 +40,6 @@ jobs:
# target: x86_64-pc-windows-msvc
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
build: |-
set -e &&
sudo apt-get install -y automake libtool make gcc pkg-config libmagic-dev libssl-dev &&
@@ -71,14 +70,12 @@ jobs:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
- if: ${{ !matrix.settings.docker }}
with:
node-version: 18
check-latest: true
cache: yarn
- name: Install
uses: dtolnay/rust-toolchain@stable
- if: ${{ !matrix.settings.docker }}
with:
toolchain: stable
targets: ${{ matrix.settings.target }}
@@ -114,16 +111,8 @@ jobs:
check-latest: true
cache: yarn
architecture: x86
- - 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/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build'
- run: ${{ matrix.settings.build }}
- name: Build
run: ${{ matrix.settings.build }}
- if: ${{ !matrix.settings.docker }}
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v3
@@ -199,7 +188,7 @@ jobs:
run: ls -R .
shell: bash
- name: Test bindings
- run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test
+ run: yarn test
test-linux-aarch64-gnu-binding:
name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
needs:
@@ -211,7 +200,7 @@ jobs:
- '14'
- '16'
- '18'
- runs-on: ubuntu-latest
+ runs-on: arm64
steps:
- uses: actions/checkout@v3
- name: Download artifacts
@@ -227,20 +216,11 @@ jobs:
yarn config set supportedArchitectures.cpu "arm64"
yarn config set supportedArchitectures.libc "glibc"
yarn install
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
- with:
- platforms: arm64
- - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- - name: Setup and run tests
- uses: addnab/docker-run-action@v3
- with:
- image: node:${{ matrix.node }}-slim
- options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build'
- run: |
- set -e
- yarn test
- ls -la
+ - name: Run tests
+ run: |
+ set -e
+ yarn test
+ ls -la
publish:
name: Publish
runs-on: ubuntu-latest