Skip to content

Commit

Permalink
remove streams from CI
Browse files Browse the repository at this point in the history
Signed-off-by: sagudev <[email protected]>
  • Loading branch information
sagudev committed Dec 18, 2024
1 parent 75100a5 commit be91a41
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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 != 'debugmozjs' }}
with:
subject-path: ./target/libmozjs-${{ matrix.platform.target }}.tar.gz

- name: Upload artifact
if: ${{ contains(matrix.features, 'streams') }}
if: ${{ matrix.features != 'debugmozjs' }}
uses: actions/upload-artifact@v4
with:
path: ./target/libmozjs-${{ matrix.platform.target }}.tar.gz
Expand All @@ -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
Expand All @@ -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 != 'debugmozjs' }}
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 != 'debugmozjs' }}
with:
subject-path: ./target/libmozjs-x86_64-unknown-linux-gnu.tar.gz

- name: Upload artifact
if: ${{ contains(matrix.features, 'streams') }}
if: ${{ matrix.features != 'debugmozjs' }}
uses: actions/upload-artifact@v4
with:
path: ./target/libmozjs-x86_64-unknown-linux-gnu.tar.gz
Expand All @@ -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"
Expand Down Expand Up @@ -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 != 'debugmozjs' }}
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 != 'debugmozjs' }}
uses: actions/upload-artifact@v4
with:
path: ./target/${{ matrix.target }}/libmozjs-x86_64-pc-windows-msvc.tar.gz
Expand Down Expand Up @@ -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 }}
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release-check.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: Version Release Check

on:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
./ohos-build cargo build --target="${{ matrix.target }}" --verbose

0 comments on commit be91a41

Please sign in to comment.