diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9e6d760..3650b0b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -34,10 +34,10 @@ jobs: - os: macos-13 target: x86_64-apple-darwin arch: x64 - - os: buildjet-2vcpu-ubuntu-2204 + - os: ubuntu-24.04 target: x86_64-unknown-linux-gnu arch: x64 - - os: buildjet-4vcpu-ubuntu-2204-arm + - os: ubuntu-24.04-arm target: aarch64-unknown-linux-gnu arch: arm64 - os: windows-2025 @@ -47,7 +47,7 @@ jobs: target: aarch64-apple-darwin arch: arm64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: ${{ github.event.release.tag_name }}${{ github.event.inputs.name }} - uses: actions/setup-node@v4 @@ -89,13 +89,12 @@ jobs: # fail-fast: false # matrix: # node_version: - # - 16 - # - 18 # - 20 - # - 21 + # - 22 + # - 24 # os: - # - buildjet-2vcpu-ubuntu-2204 - # - buildjet-4vcpu-ubuntu-2204-arm + # - ubuntu-24.04 + # - ubuntu-24.04-arm # steps: # - run: apk add build-base git python3 wget github-cli # # WORKAROUND @@ -128,13 +127,13 @@ jobs: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish-npm: - if: '${{ github.event.release.tag_name }}' + if: "${{ github.event.release.tag_name }}" needs: - publish-github # - publish-github-docker runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: ${{ github.event.release.tag_name }} - uses: actions/setup-node@v4 diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml index 0fce191..67aab47 100644 --- a/.github/workflows/rust-ci.yaml +++ b/.github/workflows/rust-ci.yaml @@ -1,12 +1,12 @@ name: Rust CI -'on': +on: push: branches: - - main - pull_request: null - workflow_dispatch: null + - main + pull_request: + workflow_dispatch: schedule: - - cron: 0 14 * * 1 + - cron: 0 14 * * 1 jobs: rust-ci: uses: IronCoreLabs/workflows/.github/workflows/rust-ci.yaml@rust-ci-v2 diff --git a/.github/workflows/rust-daily.yaml b/.github/workflows/rust-daily.yaml index 2a0d2f8..098f4dd 100644 --- a/.github/workflows/rust-daily.yaml +++ b/.github/workflows/rust-daily.yaml @@ -6,5 +6,5 @@ on: jobs: rust-daily: - uses: IronCoreLabs/workflows/.github/workflows/rust-daily.yaml@rust-daily-v0 + uses: IronCoreLabs/workflows/.github/workflows/rust-daily.yaml@rust-daily-v1 secrets: inherit diff --git a/.github/workflows/typescript-napi-ci.yaml b/.github/workflows/typescript-napi-ci.yaml index c75d693..ef2605b 100644 --- a/.github/workflows/typescript-napi-ci.yaml +++ b/.github/workflows/typescript-napi-ci.yaml @@ -5,7 +5,7 @@ concurrency: on: push: branches: - - main + - main pull_request: workflow_dispatch: jobs: @@ -14,80 +14,75 @@ jobs: strategy: matrix: rust_version: - - stable - - beta + - stable + # Uncomment after Rust 1.90.0 comes out: https://github.com/rust-lang/rust/issues/145699 + # - beta node_version: - - 20 - - 22 - - 24 + - 20 + - 22 + - 24 system: - - os: macos-13 - target: x86_64-apple-darwin - arch: x64 - - os: buildjet-2vcpu-ubuntu-2204 - target: x86_64-unknown-linux-gnu - arch: x64 - - os: buildjet-4vcpu-ubuntu-2204-arm - target: arm64-unknown-linux-gnu - arch: arm64 - - os: windows-2025 - target: x86_64-pc-windows-msvc - arch: x64 - - os: macos-14 - target: aarch64-apple-darwin - arch: arm64 + - os: macos-13 + target: x86_64-apple-darwin + arch: x64 + - os: ubuntu-24.04 + target: x86_64-unknown-linux-gnu + arch: x64 + - os: ubuntu-24.04-arm + target: arm64-unknown-linux-gnu + arch: arm64 + - os: windows-2025 + target: x86_64-pc-windows-msvc + arch: x64 + - os: macos-14 + target: aarch64-apple-darwin + arch: arm64 fail-fast: false steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node_version }} - cache: yarn - architecture: ${{ matrix.system.arch }} - - uses: IronCoreLabs/rust-toolchain@v1 - with: - toolchain: ${{ matrix.rust_version }} - - name: Install modules - run: yarn install --ignore-scripts - - name: Compile - run: yarn run compile - - name: Run tests - run: yarn run test - - # broken now that node20 is forced even for checkout@v3, which doesn't work using the # WORKAROUND below any more. - # test-docker: - # runs-on: ${{ matrix.os }} - # container: - # image: node:${{ matrix.node_version }}-alpine - # strategy: - # matrix: - # rust_version: - # - stable - # - beta - # node_version: - # - 16 - # - 18 - # - 20 - # - 21 - # os: - # - buildjet-2vcpu-ubuntu-2204 - # - buildjet-4vcpu-ubuntu-2204-arm - # fail-fast: false - # steps: - # - run: apk add build-base git python3 wget - # # WORKAROUND - # # https://github.com/actions/runner/issues/801#issuecomment-1374967227 - # - run: | - # apk add gcompat - # sed -i "s:ID=alpine:ID=NotpineForGHA:" /etc/os-release - # - run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}" - # - uses: actions/checkout@v4 - # - uses: IronCoreLabs/rust-toolchain@v1 - # with: - # toolchain: ${{ matrix.rust_version }} - # - name: Install modules - # run: yarn install --ignore-scripts - # - name: Compile - # run: yarn run compile - # - name: Run tests - # run: yarn run test + - uses: actions/checkout@v5 + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node_version }} + cache: yarn + architecture: ${{ matrix.system.arch }} + - uses: IronCoreLabs/rust-toolchain@v1 + with: + toolchain: ${{ matrix.rust_version }} + - name: Install modules + run: yarn install --ignore-scripts + - name: Compile + run: yarn run compile + - name: Run tests + run: yarn run test + +# broken now that node20 is forced even for checkout@v3, which doesn't work using the # WORKAROUND below any more. +# test-docker: +# runs-on: ${{ matrix.os }} +# container: +# image: node:${{ matrix.node_version }}-alpine +# strategy: +# matrix: +# rust_version: +# - stable +# - beta +# node_version: +# - 20 +# - 22 +# - 24 +# os: +# - ubuntu-24.04 +# - ubuntu-24.04-arm +# fail-fast: false +# steps: +# - run: apk add build-base git python3 wget +# - run: echo RUSTFLAGS="-C target-feature=-crt-static" >> "${GITHUB_ENV}" +# - uses: actions/checkout@v5 +# - uses: IronCoreLabs/rust-toolchain@v1 +# with: +# toolchain: ${{ matrix.rust_version }} +# - name: Install modules +# run: yarn install --ignore-scripts +# - name: Compile +# run: yarn run compile +# - name: Run tests +# run: yarn run test diff --git a/flake.lock b/flake.lock index f30e4fe..e5b6db0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749558678, - "narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=", + "lastModified": 1756819007, + "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a12f3a99614894502e73eb816e9e076b0ab05730", + "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "type": "github" }, "original": { @@ -60,11 +60,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749609482, - "narHash": "sha256-R+Y3tXIUAMosrgo/ynhIUPEONZ+cM0ScbgN7KA8OkoE=", + "lastModified": 1756866691, + "narHash": "sha256-YWJsM0HfdFLcaoP5OeyzjX6MjGnJ0Acm+bg1QN8MKjo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a17da8deb943e7c8b4151914abbfe33d5a4e5b0d", + "rev": "fb6dab6f320291a8edd31c1d67f078c6f7384a02", "type": "github" }, "original": { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 806505d..f637288 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] profile = "default" -channel = "1.87.0" +channel = "1.89.0" diff --git a/yarn.lock b/yarn.lock index bedfcbb..523fb98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1371,6 +1371,13 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"