Skip to content

Commit

Permalink
feat: upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Brooooooklyn
Brooooooklyn committed Feb 7, 2024
1 parent 2eaff51 commit d93e485
Show file tree
Hide file tree
Showing 21 changed files with 5,537 additions and 5,466 deletions.
165 changes: 85 additions & 80 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,38 @@ concurrency:
cancel-in-progress: true
jobs:
build:
if: "!contains(github.event.head_commit.message, 'skip ci')"
strategy:
fail-fast: false
matrix:
settings:
- host: macos-latest
- host: macos-14
target: x86_64-apple-darwin
setup: |
brew install meson llvm
build: |
brew install meson
yarn workspace @napi-rs/image build --features with_simd
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
export cc=clang
export cxx=clang++
clang --version
yarn workspace @napi-rs/image build --target x86_64-apple-darwin --features with_simd
- host: windows-latest
build: |
python -m pip install meson
yarn workspace @napi-rs/image build --features with_simd
yarn workspace @napi-rs/image build --target x86_64-pc-windows-msvc --features with_simd
target: x86_64-pc-windows-msvc
- host: ubuntu-latest
- host: macos-14
setup: |
sudo apt update
sudo apt install meson -y
brew install meson llvm
cargo install cargo-xwin
build: |
export XWIN_CACHE_DIR="$(pwd)/.xwin"
export XWIN_ARCH=x86
export CFLAGS="-mavx2 /FI $(pwd)/.xwin/crt/include/intrin0.h"
export CXXFLAGS="-mavx2 /FI $(pwd)/.xwin/crt/include/intrin0.h"
export CFLAGS="-mavx2 -mpclmul /FI $(pwd)/.xwin/crt/include/intrin0.h"
export CXXFLAGS="-mavx2 -mpclmul /FI $(pwd)/.xwin/crt/include/intrin0.h"
export CARGO_PROFILE_RELEASE_LTO="false"
yarn workspace @napi-rs/image build --features with_simd --target i686-pc-windows-msvc
export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
clang --version
CARGO="cargo-xwin" yarn workspace @napi-rs/image build --features with_simd --target i686-pc-windows-msvc
target: i686-pc-windows-msvc
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
Expand All @@ -61,8 +66,8 @@ jobs:
set -e &&
apt-get update &&
apt-get install meson -y &&
rm /usr/lib/llvm-15/lib/libc++.so &&
export LDFLAGS="-L/usr/lib/llvm-15/lib -L/usr/x86_64-unknown-linux-gnu/lib/gcc/x86_64-unknown-linux-gnu/4.8.5" &&
rm /usr/lib/llvm-16/lib/libc++.so &&
export LDFLAGS="-L/usr/lib/llvm-16/lib -L/usr/x86_64-unknown-linux-gnu/lib/gcc/x86_64-unknown-linux-gnu/4.8.5" &&
export CFLAGS="-fuse-ld=lld -B/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5 --sysroot=/usr/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/sysroot" &&
export CXXFLAGS="-stdlib=libc++ -fuse-ld=lld -B/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5 --sysroot=/usr/x86_64-unknown-linux-gnu/x86_64-unknown-linux-gnu/sysroot -L/usr/lib/llvm-15/lib" &&
yarn workspace @napi-rs/image build --features with_simd --target x86_64-unknown-linux-gnu &&
Expand All @@ -79,21 +84,26 @@ jobs:
export LIB_AOM_STATIC_LIB_PATH=/usr/lib &&
export LIB_AOM_INCLUDE_PATH=/usr/include/aom/aom &&
export LIB_AOM_PKG_CONFIG_PATH=/usr/lib/pkgconfig &&
yarn workspace @napi-rs/image build --features with_simd &&
yarn workspace @napi-rs/image build --target x86_64-unknown-linux-musl --features with_simd &&
chmod -R 777 target
- host: macos-latest
- host: macos-14
target: aarch64-apple-darwin
setup: |
brew install meson llvm
build: |
brew install meson
yarn workspace @napi-rs/image build --features with_simd
export cc=clang
export cxx=clang++
MACOSX_DEPLOYMENT_TARGET=11.0 yarn workspace @napi-rs/image build --target aarch64-apple-darwin --features with_simd
- host: ubuntu-latest
target: aarch64-unknown-linux-gnu
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
build: >-
set -e &&
rm /usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib/libunwind.so &&
rm /usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib/libc++.so &&
export LDFLAGS="-L/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5" &&
export CFLAGS="-fuse-ld=lld -mcrc -B/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot" &&
export CXXFLAGS="-fuse-ld=lld -mcrc -B/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot -L/usr/aarch64-unknown-linux-gnu/lib/llvm-15/lib -stdlib=libc++" &&
export CXXFLAGS="-fuse-ld=lld -mcrc -B/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5 --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot -L/usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib -stdlib=libc++" &&
yarn workspace @napi-rs/image build --features with_simd --target aarch64-unknown-linux-gnu &&
chmod -R 777 target
- host: ubuntu-latest
Expand All @@ -102,23 +112,13 @@ jobs:
sudo apt-get update
sudo apt-get install meson gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
build: |
yarn workspace @napi-rs/image build --features oxipng_libdeflater --zig --zig-link-only
yarn workspace @napi-rs/image build --target armv7-unknown-linux-gnueabihf --features oxipng_libdeflater --zig --zig-link-only
- host: ubuntu-latest
target: aarch64-linux-android
build: |
sudo apt update
sudo apt install meson -y
yarn workspace @napi-rs/image build --features with_simd
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip packages/*/*.node
- host: ubuntu-latest
target: armv7-linux-androideabi
build: |
sudo apt update
sudo apt install meson -y
export C_INCLUDE_PATH="${ANDROID_NDK_LATEST_HOME}/sources/android/cpufeatures";
export CMAKE_TOOLCHAIN_FILE_armv7_linux_androideabi="${ANDROID_NDK_LATEST_HOME}/build/cmake/android.toolchain.cmake";
yarn workspace @napi-rs/image build --features oxipng_libdeflater
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip packages/*/*.node
yarn workspace @napi-rs/image build --target aarch64-linux-android --features with_simd
- host: ubuntu-latest
target: aarch64-unknown-linux-musl
downloadTarget: aarch64-unknown-linux-musl
Expand All @@ -131,16 +131,16 @@ jobs:
apk add --update --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing --no-cache aom-dev perl meson &&
yarn workspace @napi-rs/image build --target aarch64-unknown-linux-musl --features with_simd &&
chmod -R 777 target
name: stable - ${{ matrix.settings.target }} - node@18
name: stable - ${{ matrix.settings.target }} - node@20
runs-on: ${{ matrix.settings.host }}
env:
RUST_TARGET: ${{ matrix.settings.target }}
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: yarn
- name: Setup nasm
uses: ilammy/setup-nasm@v1
Expand All @@ -151,24 +151,20 @@ jobs:
toolchain: stable
targets: ${{ matrix.settings.target }}
- name: Cache cargo registry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
.cargo-cache
.xwin
target/
key: ${{ matrix.settings.target }}-cargo-cache
- uses: goto-bus-stop/setup-zig@v2
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
with:
version: 0.10.1
- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1
if: ${{ matrix.settings.target == 'i686-pc-windows-msvc' }}
with:
version: '16'
version: 0.11.0
- name: Setup toolchain
run: ${{ matrix.settings.setup }}
if: ${{ matrix.settings.setup }}
Expand All @@ -187,7 +183,7 @@ jobs:
if: ${{ !matrix.settings.docker }}
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: packages/*/*.node
Expand All @@ -199,45 +195,44 @@ jobs:
- uses: actions/checkout@v4
- name: Build
id: build
uses: vmactions/freebsd-vm@v0
uses: cross-platform-actions/action@v0.22.0
env:
DEBUG: napi:*
RUSTUP_HOME: /usr/local/rustup
CARGO_HOME: /usr/local/cargo
DEBUG: 'napi:*'
RUSTUP_HOME: /home/runner/rustup
CARGO_HOME: /home/runner/cargo
RUSTUP_IO_THREADS: 1
CARGO_PROFILE_RELEASE_LTO: false
with:
envs: DEBUG RUSTUP_HOME CARGO_HOME RUSTUP_IO_THREADS CARGO_PROFILE_RELEASE_LTO
usesh: true
mem: 3000
prepare: |
pkg install -y curl cmake nasm node perl5 npm yarn
operating_system: freebsd
version: '13.2'
memory: 8G
cpu_count: 3
environment_variables: 'DEBUG RUSTUP_IO_THREADS'
shell: bash
run: |
env | sort
sudo pkg install -y -f curl node libnghttp2 npm cmake nasm perl5
sudo npm install -g yarn --ignore-scripts
curl https://sh.rustup.rs -sSf --output rustup.sh
sh rustup.sh -y --profile minimal --default-toolchain beta
export PATH="/usr/local/cargo/bin:$PATH"
sh rustup.sh -y --default-toolchain stable
source "$HOME/.cargo/env"
echo "~~~~ rustc --version ~~~~"
rustc --version
echo "~~~~ node -v ~~~~"
node -v
echo "~~~~ yarn --version ~~~~"
yarn --version
run: |
export PATH="/usr/local/cargo/bin:$PATH"
export RUST_TARGET="x86_64-unknown-freebsd"
pwd
ls -lah
whoami
env
freebsd-version
yarn install --immutable --mode=skip-build
yarn workspace @napi-rs/image build --features oxipng_libdeflater
yarn test
rm -rf node_modules
rm -rf target
rm -rf .yarn/cache
rm -f *.core
rm -rf .yarn
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: bindings-freebsd
path: packages/*/*.node
Expand All @@ -252,24 +247,34 @@ jobs:
settings:
- host: windows-latest
target: x86_64-pc-windows-msvc
# macOS on GitHub Actions does not support avx2
# - host: macos-latest
# target: x86_64-apple-darwin
- host: macos-14
target: x86_64-apple-darwin
- host: macos-14
target: aarch64-apple-darwin
node:
- '16'
- '18'
- '20'
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: startsWith(matrix.settings.target, 'x86_64')
with:
node-version: ${{ matrix.node }}
cache: yarn
cache: 'yarn'
architecture: 'x64'
- name: Setup node
uses: actions/setup-node@v4
if: startsWith(matrix.settings.target, 'aarch64')
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
architecture: 'arm64'
- name: Install dependencies
run: yarn install --immutable
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: artifacts
Expand All @@ -291,20 +296,20 @@ jobs:
fail-fast: false
matrix:
node:
- '16'
- '18'
- '20'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: yarn
- name: Install dependencies
run: yarn install --immutable
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-x86_64-unknown-linux-gnu
path: artifacts
Expand All @@ -324,20 +329,20 @@ jobs:
fail-fast: false
matrix:
node:
- '16'
- '18'
- '20'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: yarn
- name: Install dependencies
run: yarn install --immutable --mode=skip-build
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-x86_64-unknown-linux-musl
path: artifacts
Expand All @@ -357,13 +362,13 @@ jobs:
fail-fast: false
matrix:
node:
- '16'
- '18'
- '20'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-aarch64-unknown-linux-gnu
path: artifacts
Expand Down Expand Up @@ -397,13 +402,13 @@ jobs:
fail-fast: false
matrix:
node:
- '16'
- '18'
- '20'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-armv7-unknown-linux-gnueabihf
path: artifacts
Expand Down Expand Up @@ -442,14 +447,14 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: yarn
- name: Install dependencies
run: yarn install --immutable --mode=skip-build
- name: Download all artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Move artifacts
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ output-exif.*
!output-exif.image.webp
nasa-small.*
output-overlay-png.png
output-debian.jpeg
Loading

0 comments on commit d93e485

Please sign in to comment.