Skip to content

Commit f5e751c

Browse files
unclesp1d3runclesp1d3r
authored
Merge branch 'main' into dependabot/github_actions/actions/download-artifact-8
2 parents 50c8340 + dc2577e commit f5e751c

130 files changed

Lines changed: 8267 additions & 6514 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,8 @@ LICENSE text
7878
*.so binary
7979
*.dylib binary
8080

81+
# Test fixture binaries
82+
tests/fixtures/test_empty.bin binary
83+
tests/fixtures/test_unknown.bin binary
84+
8185
.env text=utf-8 eol=lf

‎.github/copilot-instructions.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,11 @@ Container parsers assign weights (1.0-10.0) to sections based on string likeliho
6767
Strings are grouped by `(text, encoding)` tuple in a `HashMap<(String, Encoding), Vec<StringOccurrence>>`:
6868

6969
- **Preserve all occurrences**: Each occurrence captures offset, RVA, section, source, tags, score, confidence
70+
7071
- **Tag merging**: Union all tags via `HashSet`, then sort
72+
7173
- **Combined scoring formula**:
74+
7275
```text
7376
base_score = max(occurrence.original_score)
7477
occurrence_bonus = 5 * (count - 1)

‎.github/workflows/audit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
contents: read
2323
issues: write
2424
steps:
25-
- uses: actions/checkout@v6
26-
- uses: actions-rust-lang/audit@v1
25+
- uses: actions/checkout@v6.0.2
26+
- uses: actions-rust-lang/audit@v1.2.7
2727
name: Audit Rust Dependencies

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,23 @@ jobs:
2424
quality:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v6
27+
- uses: actions/checkout@v6.0.2
2828
- uses: dtolnay/rust-toolchain@efa25f7f19611383d5b0ccf2d1c8914531636bf9
2929
with:
3030
components: rustfmt, clippy
3131
toolchain: 1.93.0
32-
- uses: jdx/mise-action@v3
32+
- uses: jdx/mise-action@v3.6.3
3333
with:
3434
install: true
3535
cache: true
3636
github_token: ${{ secrets.GITHUB_TOKEN }}
3737

38+
- name: Ensure rustfmt and clippy are installed
39+
run: rustup component add rustfmt clippy
40+
41+
- name: Cache Rust dependencies
42+
uses: Swatinem/rust-cache@v2.8.2
43+
3844
- name: Rustfmt Check
3945
run: cargo fmt --all -- --check
4046

@@ -52,28 +58,31 @@ jobs:
5258
- toolchain: stable minus 3 releases
5359
- toolchain: stable minus 4 releases
5460
steps:
55-
- uses: actions/checkout@v6
61+
- uses: actions/checkout@v6.0.2
5662
- uses: dtolnay/rust-toolchain@efa25f7f19611383d5b0ccf2d1c8914531636bf9
5763
with:
5864
components: rustfmt, clippy
5965
toolchain: ${{ matrix.toolchain }}
6066

6167
- name: Cache Rust dependencies
62-
uses: Swatinem/rust-cache@v2
68+
uses: Swatinem/rust-cache@v2.8.2
6369

6470
- name: Check MSRV compliance
6571
run: cargo check --all-features
6672

6773
test:
6874
runs-on: ubuntu-latest
6975
steps:
70-
- uses: actions/checkout@v6
71-
- uses: jdx/mise-action@v3
76+
- uses: actions/checkout@v6.0.2
77+
- uses: jdx/mise-action@v3.6.3
7278
with:
7379
install: true
7480
cache: true
7581
github_token: ${{ secrets.GITHUB_TOKEN }}
7682

83+
- name: Generate test fixtures
84+
run: just gen-fixtures
85+
7786
- name: Run tests (all features)
7887
run: just test-ci
7988

@@ -93,13 +102,16 @@ jobs:
93102

94103
runs-on: ${{ matrix.os }}
95104
steps:
96-
- uses: actions/checkout@v6
97-
- uses: jdx/mise-action@v3
105+
- uses: actions/checkout@v6.0.2
106+
- uses: jdx/mise-action@v3.6.3
98107
with:
99108
install: true
100109
cache: true
101110
github_token: ${{ secrets.GITHUB_TOKEN }}
102111

112+
- name: Generate test fixtures
113+
run: just gen-fixtures
114+
103115
- name: Run tests (all features)
104116
run: just test-ci
105117
- name: Build release
@@ -109,18 +121,21 @@ jobs:
109121
runs-on: ubuntu-latest
110122
needs: [test, test-cross-platform]
111123
steps:
112-
- uses: actions/checkout@v6
113-
- uses: jdx/mise-action@v3
124+
- uses: actions/checkout@v6.0.2
125+
- uses: jdx/mise-action@v3.6.3
114126
with:
115127
install: true
116128
cache: true
117129
github_token: ${{ secrets.GITHUB_TOKEN }}
118130

131+
- name: Generate test fixtures
132+
run: just gen-fixtures
133+
119134
- name: Generate coverage
120135
run: just coverage
121136

122137
- name: Upload to Codecov
123-
uses: codecov/codecov-action@v5
138+
uses: codecov/codecov-action@v5.5.2
124139
with:
125140
files: lcov.info
126141
fail_ci_if_error: false

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
name: CodeQL Analyze
2020
runs-on: ubuntu-22.04
2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v6.0.2
2323

24-
- uses: jdx/mise-action@v3
24+
- uses: jdx/mise-action@v3.6.3
2525
with:
2626
install: true
2727
cache: true

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
contents: read
2323

2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v6.0.2
2626

27-
- uses: jdx/mise-action@v3
27+
- uses: jdx/mise-action@v3.6.3
2828
with:
2929
install: true
3030
cache: true

‎.github/workflows/docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v6
28+
uses: actions/checkout@v6.0.2
2929

30-
- uses: jdx/mise-action@v3
30+
- uses: jdx/mise-action@v3.6.3
3131
with:
3232
install: true
3333
cache: true
@@ -59,4 +59,4 @@ jobs:
5959
steps:
6060
- name: Deploy to GitHub Pages
6161
id: deployment
62-
uses: actions/deploy-pages@v4
62+
uses: actions/deploy-pages@v4.0.5

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ jobs:
6464
# we specify bash to get pipefail; it guards against the `curl` command
6565
# failing. otherwise `sh` won't catch that `curl` returned non-0
6666
shell: bash
67-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.31.0/cargo-dist-installer.sh | sh"
6868
- name: Cache dist
69-
uses: actions/upload-artifact@v6
69+
uses: actions/upload-artifact@v7
7070
with:
7171
name: cargo-dist-cache
7272
path: ~/.cargo/bin/dist
@@ -82,7 +82,7 @@ jobs:
8282
cat plan-dist-manifest.json
8383
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
8484
- name: "Upload dist-manifest.json"
85-
uses: actions/upload-artifact@v6
85+
uses: actions/upload-artifact@v7
8686
with:
8787
name: artifacts-plan-dist-manifest
8888
path: plan-dist-manifest.json
@@ -151,7 +151,7 @@ jobs:
151151
dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
152152
echo "dist ran successfully"
153153
- name: Attest
154-
uses: actions/attest-build-provenance@v3
154+
uses: actions/attest-build-provenance@v4
155155
with:
156156
subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*"
157157
- id: cargo-dist
@@ -168,7 +168,7 @@ jobs:
168168
169169
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
170170
- name: "Upload artifacts"
171-
uses: actions/upload-artifact@v6
171+
uses: actions/upload-artifact@v7
172172
with:
173173
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
174174
path: |
@@ -233,7 +233,7 @@ jobs:
233233
find . -name '*.cdx.xml' | tee -a "$GITHUB_OUTPUT"
234234
echo "EOF" >> "$GITHUB_OUTPUT"
235235
- name: "Upload artifacts"
236-
uses: actions/upload-artifact@v6
236+
uses: actions/upload-artifact@v7
237237
with:
238238
name: artifacts-build-global
239239
path: |
@@ -279,7 +279,7 @@ jobs:
279279
cat dist-manifest.json
280280
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
281281
- name: "Upload dist-manifest.json"
282-
uses: actions/upload-artifact@v6
282+
uses: actions/upload-artifact@v7
283283
with:
284284
# Overwrite the previous copy
285285
name: artifacts-dist-manifest

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: "Checkout code"
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v6.0.2
3030
with:
3131
persist-credentials: false
3232

@@ -38,7 +38,7 @@ jobs:
3838
publish_results: true
3939

4040
- name: "Upload artifact"
41-
uses: actions/upload-artifact@v6
41+
uses: actions/upload-artifact@v7
4242
with:
4343
name: SARIF file
4444
path: results.sarif

‎.github/workflows/security.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
audit:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v6
27+
- uses: actions/checkout@v6.0.2
2828

29-
- uses: jdx/mise-action@v3
29+
- uses: jdx/mise-action@v3.6.3
3030
with:
3131
install: true
3232
cache: true

0 commit comments

Comments
 (0)