Skip to content

Commit

Permalink
Merge pull request #9 from carbonteq/add-linux-musl
Browse files Browse the repository at this point in the history 
add linux musl target
  • Loading branch information
@volf52
volf52 authored Aug 1, 2024
2 parents b01da16 + 1ed2f78 commit 699323d
Show file tree
Hide file tree
Showing 30 changed files with 1,822 additions and 4,270 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
5 changes: 5 additions & 0 deletions .changeset/honest-chairs-sleep.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@carbonteq/jwt": patch
---

Add linux musl support
5 changes: 5 additions & 0 deletions .changeset/slimy-eels-decide.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@carbonteq/jwt": minor
---

Heavy rewrite
171 changes: 84 additions & 87 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
name: Test CI
name: CI
env:
DEBUG: napi:*
APP_NAME: jwt
MACOSX_DEPLOYMENT_TARGET: '10.13'
'on':
MACOSX_DEPLOYMENT_TARGET: "10.13"
permissions:
contents: write
id-token: write
"on":
push:
branches:
- main
tags-ignore:
- '**'
- "**"
paths-ignore:
- '**/*.md'
- "**/*.md"
- LICENSE
- '**/*.gitignore'
- "**/*.gitignore"
- .editorconfig
- docs/**
pull_request: null
Expand All @@ -24,43 +27,40 @@ jobs:
settings:
- host: macos-latest
target: x86_64-apple-darwin
build: |
yarn build
strip -x *.node
build: corepack enable && yarn build --target x86_64-apple-darwin
- host: windows-latest
build: yarn build
build: corepack enable && yarn build --target x86_64-pc-windows-msvc
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 &&
yarn build --target x86_64-unknown-linux-gnu &&
strip *.node
build: corepack enable && yarn build --target x86_64-unknown-linux-gnu
- host: ubuntu-latest
target: x86_64-unknown-linux-musl
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: corepack enable && yarn build --target x86_64-unknown-linux-musl
- host: macos-latest
target: aarch64-apple-darwin
build: |
yarn build --target aarch64-apple-darwin
strip -x *.node
name: stable - ${{ matrix.settings.target }} - node@18
build: corepack enable && yarn build --target aarch64-apple-darwin
name: stable - ${{ matrix.settings.target }} - node@20
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: ${{ !matrix.settings.docker }}
with:
node-version: 18
check-latest: true
cache: yarn
node-version: 20
- name: Setup yarn
run: corepack enable
- name: Install
uses: dtolnay/rust-toolchain@stable
if: ${{ !matrix.settings.docker }}
with:
toolchain: stable
targets: ${{ matrix.settings.target }}
- name: Cache cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
Expand All @@ -70,9 +70,9 @@ jobs:
target/
key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
- uses: goto-bus-stop/setup-zig@v2
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }}
with:
version: 0.10.1
version: 0.11.0
- name: Setup toolchain
run: ${{ matrix.settings.setup }}
if: ${{ matrix.settings.setup }}
Expand All @@ -84,26 +84,25 @@ jobs:
- name: Install dependencies
run: yarn install
- name: Setup node x86
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: matrix.settings.target == 'i686-pc-windows-msvc'
with:
node-version: 18
check-latest: true
node-version: 20
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'
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
uses: actions/upload-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: ${{ env.APP_NAME }}.*.node
Expand All @@ -116,24 +115,25 @@ jobs:
fail-fast: false
matrix:
settings:
- host: macos-latest
target: x86_64-apple-darwin
- host: windows-latest
target: x86_64-pc-windows-msvc
node:
- '16'
- '18'
- "18"
- "20"
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: yarn
architecture: x64
- name: Install dependencies
run: yarn install
run: corepack enable && yarn install
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: .
Expand All @@ -150,81 +150,77 @@ jobs:
fail-fast: false
matrix:
node:
- '16'
- '18'
- "18"
- "20"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: yarn
- name: Install dependencies
run: yarn install
run: corepack enable && yarn install
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-x86_64-unknown-linux-gnu
path: .
- name: List packages
run: ls -R .
shell: bash
- name: Test bindings
run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test
# universal-macOS:
# name: Build universal macOS binary
# needs:
# - build
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@v3
# - name: Setup node
# uses: actions/setup-node@v3
# with:
# node-version: 18
# check-latest: true
# cache: yarn
# - name: Install dependencies
# run: yarn install
# - name: Download macOS x64 artifact
# uses: actions/download-artifact@v3
# with:
# name: bindings-x86_64-apple-darwin
# path: artifacts
# - name: Download macOS arm64 artifact
# uses: actions/download-artifact@v3
# with:
# name: bindings-aarch64-apple-darwin
# path: artifacts
# - name: Combine binaries
# run: yarn universal
# - name: Upload artifact
# uses: actions/upload-artifact@v3
# with:
# name: bindings-universal-apple-darwin
# path: ${{ env.APP_NAME }}.*.node
# if-no-files-found: error
run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim /bin/sh -c "corepack enable && yarn test"
test-linux-x64-musl-binding:
name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
needs:
- build
strategy:
fail-fast: false
matrix:
node:
- "18"
- "20"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Install dependencies
run: |
corepack enable
yarn config set supportedArchitectures.libc "musl"
yarn install
- name: Download artifacts
uses: actions/download-artifact@v4
with:
name: bindings-x86_64-unknown-linux-musl
path: .
- name: List packages
run: ls -R .
shell: bash
- name: Test bindings
run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine /bin/sh -c "corepack enable && yarn test"
# publish:
# name: Publish
# runs-on: ubuntu-latest
# needs:
# - test-macOS-windows-binding
# - test-linux-x64-gnu-binding
# - universal-macOS
# - test-linux-x64-musl-binding
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - name: Setup node
# uses: actions/setup-node@v3
# uses: actions/setup-node@v4
# with:
# node-version: 18
# check-latest: true
# node-version: 20
# cache: yarn
# - name: Install dependencies
# run: yarn install
# - name: Download all artifacts
# uses: actions/download-artifact@v3
# uses: actions/download-artifact@v4
# with:
# path: artifacts
# - name: Move artifacts
Expand All @@ -234,6 +230,7 @@ jobs:
# shell: bash
# - name: Publish
# run: |
# npm config set provenance true
# if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";
# then
# echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
Expand Down
Loading

0 comments on commit 699323d

Please sign in to comment.