Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.10"
- name: lint
shell: bash
run: src/ci/check-check-pr.sh
Expand All @@ -129,7 +129,7 @@ jobs:
shell: bash
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.10"
- uses: actions/download-artifact@v3
with:
name: artifact-onefuzztypes
Expand Down Expand Up @@ -166,6 +166,10 @@ jobs:
. cli_venv/Scripts/activate
cd src/cli
pip install -r requirements-lint.txt
flake8 --version
bandit --version
black --version
isort --version
flake8 .
bandit -r ./onefuzz/
black onefuzz examples tests --check
Expand All @@ -182,7 +186,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: "3.10"
- name: lint
shell: bash
run: |
Expand All @@ -200,7 +204,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: "3.10"
- name: lint
shell: bash
run: |
Expand All @@ -216,7 +220,7 @@ jobs:
- run: src/ci/set-versions.sh
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.10"
- run: src/ci/onefuzztypes.sh
- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -469,7 +473,7 @@ jobs:
path: artifacts
- uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.10"
- name: Lint
shell: bash
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<SelfContained>true</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
<InvariantGlobalization>true</InvariantGlobalization>
<DebuggerSupport>false</DebuggerSupport>
<!-- /end -->
</PropertyGroup>

Expand Down
14 changes: 11 additions & 3 deletions src/cli/onefuzz/templates/libfuzzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@

# The loader DLL is managed, but links platform-specific code. Task VMs must pull the
# tools container that matches their platform (which will contain the correct DLL).
LIBFUZZER_DOTNET_LOADER_PATH = (
"{tools_dir}/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.dll"
LIBFUZZER_DOTNET_LOADER_PATH_WINDOWS = (
"{tools_dir}/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.exe"
)

LIBFUZZER_DOTNET_LOADER_PATH_LINUX = (
"{tools_dir}/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader"
)


Expand Down Expand Up @@ -806,7 +810,11 @@ def dotnet(
# This provides a `main()` function that dynamically loads a target DLL
# passed via environment variables. This is assumed to be installed on
# the VMs.
libfuzzer_dotnet_loader_dll = LIBFUZZER_DOTNET_LOADER_PATH
libfuzzer_dotnet_loader_dll = (
LIBFUZZER_DOTNET_LOADER_PATH_WINDOWS
if platform == OS.windows
else LIBFUZZER_DOTNET_LOADER_PATH_LINUX
)

coverage_containers = [
(ContainerType.setup, containers[ContainerType.setup]),
Expand Down