Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit 73cd430

Browse files
authored
Merge branch 'main' into user/noharper/autoscale-table-delete
2 parents 43f278f + c4d0cd7 commit 73cd430

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@ jobs:
375375
with:
376376
# use global.json to install the correct version
377377
global-json-file: global.json
378+
- name: install llVM
379+
run: |
380+
choco install llvm --version 16.0.6
381+
shell: powershell
378382
- run: src/ci/dotnet-fuzzing-tools.ps1
379383
shell: pwsh
380384
- uses: actions/upload-artifact@v3

src/agent/onefuzz-agent/src/work.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ impl WorkSet {
9191

9292
pub fn setup_dir(&self) -> Result<PathBuf> {
9393
let root = self.get_root_folder()?;
94-
self.setup_url.as_path(root)
94+
// Putting the setup container at the root for backward compatibility.
95+
// The path of setup folder can be used as part of the deduplication logic in the bug filing service
96+
let setup_root = root.parent().ok_or_else(|| anyhow!("Invalid root"))?;
97+
self.setup_url.as_path(setup_root)
9598
}
9699

97100
pub fn extra_setup_dir(&self) -> Result<Option<PathBuf>> {

0 commit comments

Comments
 (0)