From 43995803ec559b980c046bdd79b78c92aa3b0f3e Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 17 Aug 2023 10:57:52 +0200 Subject: [PATCH] Disable the integrity check on CI This is currently broken and it isn't going to be simple to fix. Disabling this is better than always failing. --- .github/workflows/rust.yml | 42 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dc70a3a72e5..a468d70085a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -102,25 +102,29 @@ jobs: shell: cmd run: | cargo test --verbose ${{ matrix.features }} - Integrity: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Get mozjs - run: | - bash ./mozjs/etc/get_mozjs.sh - - name: Apply patch - run: | - python3 ./mozjs/etc/update.py --no-commit mozjs.tar.xz - # Run `git add` here to force CRLF converted into LF - # so that we can check diff properly in next run - git add --all mozjs - - name: Check patch integrity - working-directory: ./mozjs - # Because we've added files in previous run, we need to - # check diff with `--staged`. - run: | - git diff --staged --no-ext-diff --quiet --exit-code + + # The integrity check is currently broken. See issue #345. + # + # Integrity: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v3 + # - name: Get mozjs + # run: | + # bash ./mozjs/etc/get_mozjs.sh + # - name: Apply patch + # run: | + # python3 ./mozjs/etc/update.py --no-commit mozjs.tar.xz + # # Run `git add` here to force CRLF converted into LF + # # so that we can check diff properly in next run + # git add --all mozjs + # - name: Check patch integrity + # working-directory: ./mozjs + # # Because we've added files in previous run, we need to + # # check diff with `--staged`. + # run: | + # git diff --staged --no-ext-diff --quiet --exit-code + build_result: name: Result runs-on: ubuntu-latest