From ee395b81b5da14bc5df33bca90b57aa75f072042 Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Wed, 18 Dec 2024 07:10:32 +0100 Subject: [PATCH] remove streams from CI Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- .github/workflows/build.yml | 22 +++++++++++----------- .github/workflows/release-check.yml | 13 ++++++------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0640636fa..cfcc5ed7cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - features: ["debugmozjs", "streams"] + features: ["debugmozjs", ""] platform: - { target: aarch64-apple-darwin, os: macos-14 } - { target: x86_64-apple-darwin, os: macos-13 } @@ -45,12 +45,12 @@ jobs: - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 - if: ${{ inputs.release && contains(matrix.features, 'streams') }} + if: ${{ inputs.release && matrix.features == '' }} with: subject-path: ./target/libmozjs-${{ matrix.platform.target }}.tar.gz - name: Upload artifact - if: ${{ contains(matrix.features, 'streams') }} + if: ${{ matrix.features == '' }} uses: actions/upload-artifact@v4 with: path: ./target/libmozjs-${{ matrix.platform.target }}.tar.gz @@ -65,7 +65,7 @@ jobs: strategy: fail-fast: false matrix: - features: ["debugmozjs", "streams"] + features: ["debugmozjs", ""] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -80,19 +80,19 @@ jobs: cargo test --tests --examples --verbose --features ${{ matrix.features }} - name: Check wrappers integrity # we generate wrappers only without debugmozjs - if: ${{ matrix.features == 'streams' }} + if: ${{ matrix.features == '' }} run: | bash ./mozjs/src/generate_wrappers.sh git diff --quiet --exit-code - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 - if: ${{ inputs.release && contains(matrix.features, 'streams') }} + if: ${{ inputs.release && matrix.features == '' }} with: subject-path: ./target/libmozjs-x86_64-unknown-linux-gnu.tar.gz - name: Upload artifact - if: ${{ contains(matrix.features, 'streams') }} + if: ${{ matrix.features == '' }} uses: actions/upload-artifact@v4 with: path: ./target/libmozjs-x86_64-unknown-linux-gnu.tar.gz @@ -103,7 +103,7 @@ jobs: strategy: fail-fast: false matrix: - features: ["debugmozjs", "streams"] + features: ["debugmozjs", ""] target: ["x86_64-pc-windows-msvc", "aarch64-pc-windows-msvc"] env: LINKER: "lld-link.exe" @@ -135,12 +135,12 @@ jobs: - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 - if: ${{ inputs.release && !contains(matrix.target, 'aarch64') && contains(matrix.features, 'streams') }} + if: ${{ inputs.release && !contains(matrix.target, 'aarch64') && matrix.features == '' }} with: subject-path: ./target/${{ matrix.target }}/libmozjs-x86_64-pc-windows-msvc.tar.gz - name: Upload artifact - if: ${{ !contains(matrix.target, 'aarch64') && contains(matrix.features, 'streams') }} + if: ${{ !contains(matrix.target, 'aarch64') && matrix.features == '' }} uses: actions/upload-artifact@v4 with: path: ./target/${{ matrix.target }}/libmozjs-x86_64-pc-windows-msvc.tar.gz @@ -186,7 +186,7 @@ jobs: env: OHOS_SDK_NATIVE: ${{ steps.setup_sdk.outputs.ohos_sdk_native }} run: | - ./ohos-build cargo build --target="${{ matrix.target }}" --features "streams" + ./ohos-build cargo build --target="${{ matrix.target }}" - name: Generate artifact attestation uses: actions/attest-build-provenance@v1 if: ${{ inputs.release }} diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index d28eafd423..4a14683419 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -1,4 +1,3 @@ - name: Version Release Check on: @@ -40,15 +39,15 @@ jobs: env: MOZJS_ARCHIVE: libmozjs-${{ matrix.platform.target }}.tar.gz run: | - cargo build --verbose --features streams - cargo test --tests --examples --verbose --features streams + cargo build --verbose + cargo test --tests --examples --verbose - name: Build from auto-download if: ${{ env.RELEASE_TAG != '' }} env: MOZJS_ATTESTATION: strict run: | - cargo build --verbose --features streams - cargo test --tests --examples --verbose --features streams + cargo build --verbose + cargo test --tests --examples --verbose verify-archive-ohos: name: "Verify archive OpenHarmony" @@ -80,11 +79,11 @@ jobs: OHOS_SDK_NATIVE: ${{ steps.setup_sdk.outputs.ohos_sdk_native }} MOZJS_ARCHIVE: libmozjs-${{ matrix.target }}.tar.gz run: | - ./ohos-build cargo build --target="${{ matrix.target }}" --verbose --features streams + ./ohos-build cargo build --target="${{ matrix.target }}" --verbose - name: Build from auto-download (arch ${{ matrix.target }}) if: ${{ env.RELEASE_TAG != '' }} env: OHOS_SDK_NATIVE: ${{ steps.setup_sdk.outputs.ohos_sdk_native }} MOZJS_ATTESTATION: strict run: | - ./ohos-build cargo build --target="${{ matrix.target }}" --verbose --features "streams" \ No newline at end of file + ./ohos-build cargo build --target="${{ matrix.target }}" --verbose