Skip to content

Commit

Permalink
Test removing double Yara
Browse files Browse the repository at this point in the history
Signed-off-by: GitHub <[email protected]>
  • Loading branch information
shenanigansd authored May 30, 2024
1 parent e3081e1 commit 79b6b55
Showing 1 changed file with 25 additions and 32 deletions.
57 changes: 25 additions & 32 deletions .github/workflows/rust-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,29 @@ jobs:
yara:
needs: lint

strategy:
fail-fast: true
matrix:
runs-on:
- ubuntu-22.04

uses: ./.github/workflows/yara.yaml
with:
runs-on: ubuntu-22.04
runs-on: ${{ matrix.runs-on }}

yara-output:
needs: yara

runs-on: ubuntu-22.04
steps:
- name: Read Matrix Output
id: read
uses: cloudposse/github-action-matrix-outputs-read@main
with:
matrix-step-name: yara

outputs:
result: ${{ steps.read.outputs.result }}

clippy:
needs: yara
Expand Down Expand Up @@ -64,35 +84,8 @@ jobs:
YARA_LIBRARY_PATH: ${{ github.workspace }}/.yara/${{ needs.yara.outputs.library-path }}
run: cargo clippy -- -D clippy::all -D clippy::pedantic -D clippy::cargo -A clippy::cargo_common_metadata -A clippy::multiple_crate_versions

yara-test:
needs: clippy

strategy:
fail-fast: true
matrix:
runs-on:
- ubuntu-22.04

uses: ./.github/workflows/yara.yaml
with:
runs-on: ${{ matrix.runs-on }}

yara-test-output:
needs: yara-test

runs-on: ubuntu-22.04
steps:
- name: Read Matrix Output
id: read
uses: cloudposse/github-action-matrix-outputs-read@main
with:
matrix-step-name: yara

outputs:
result: ${{ steps.read.outputs.result }}

test:
needs: [yara-test, yara-test-output]
needs: [yara, yara-output]

strategy:
matrix:
Expand All @@ -108,7 +101,7 @@ jobs:
- name: Download YARA
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
with:
name: ${{ fromJson(needs.yara-test-output.outputs.result).artifacts[matrix.triple.runs-on] }}
name: ${{ fromJson(needs.yara-output.outputs.result).artifacts[matrix.triple.runs-on] }}
path: .yara

- name: Setup Rust
Expand All @@ -125,8 +118,8 @@ jobs:
- name: Run tests
env:
RUST_BACKTRACE: full
YARA_INCLUDE_DIR: ${{ github.workspace }}/.yara/${{ needs.yara-test.outputs.include-dir }}
YARA_LIBRARY_PATH: ${{ github.workspace }}/.yara/${{ needs.yara-test.outputs.library-path }}
YARA_INCLUDE_DIR: ${{ github.workspace }}/.yara/${{ needs.yara.outputs.include-dir }}
YARA_LIBRARY_PATH: ${{ github.workspace }}/.yara/${{ needs.yara.outputs.library-path }}
run: cargo test --no-fail-fast

docs-build:
Expand Down

0 comments on commit 79b6b55

Please sign in to comment.