From c9565aa7b1fbe9bccab27d3a8f32f7434463204e Mon Sep 17 00:00:00 2001 From: lucarlig Date: Fri, 8 Mar 2024 09:56:04 +0000 Subject: [PATCH] update CI to use OpenHarmony-v4.1-Beta1 --- .github/workflows/bench-test.yaml | 6 +++--- scripts/counters.sh | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bench-test.yaml b/.github/workflows/bench-test.yaml index 6fa7866..7e2f50b 100644 --- a/.github/workflows/bench-test.yaml +++ b/.github/workflows/bench-test.yaml @@ -27,7 +27,7 @@ jobs: timeout_minutes: 5 max_attempts: 3 retry_on: error - command: git clone https://gitee.com/openharmony/${{ matrix.project }}.git + command: git clone --branch OpenHarmony-v4.1-Beta1 https://gitee.com/openharmony/${{ matrix.project }}.git - name: Cache Cargo dependencies and binaries uses: actions/cache@v4 @@ -43,13 +43,13 @@ jobs: - name: prepare repository for dylint working-directory: ./${{ matrix.project }} run: | - curl -o prepare_repo.sh https://raw.githubusercontent.com/trusted-programming/mate/${GITHUB_REF##*/}/scripts/prepare_repo.sh + curl -o prepare_repo.sh https://raw.githubusercontent.com/trusted-programming/mate/main/scripts/prepare_repo.sh bash prepare_repo.sh - name: count occurrences before working-directory: ./${{ matrix.project }} run: | - curl -o counters.sh https://raw.githubusercontent.com/trusted-programming/mate/${GITHUB_REF##*/}/scripts/counters.sh + curl -o counters.sh https://raw.githubusercontent.com/trusted-programming/mate/main/scripts/counters.sh bash counters.sh before - name: Lint fix (run 5 times) diff --git a/scripts/counters.sh b/scripts/counters.sh index 6a2a1da..0019c7a 100755 --- a/scripts/counters.sh +++ b/scripts/counters.sh @@ -8,10 +8,7 @@ echo echo "### FILE OUTPUT ###" echo -if ! dylint_output=$(cargo dylint --workspace --all 2>&1); then - echo "Error running cargo dylint" >&2 - exit 1 -fi +dylint_output=$(cargo dylint --workspace --all -- --lib 2>&1) echo "$dylint_output" echo