From e71cb92bb6f6c9ac00a864593b86be02d99a0d80 Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:24:47 -0800 Subject: [PATCH 1/6] Update .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f4cff580f..6fd1293a29 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,7 @@ lcov.info /src/ApiService/ApiService/Properties/PublishProfiles/* /src/ApiService/ApiService/Properties/ServiceDependencies/* -.vs \ No newline at end of file +.vs + +# Local fork tools, not to be merged back into main repo +/.github/workflows/sync-fork.yml From 0f1a6c92416919ab90b06cad6f1cbddd5a81a83b Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:26:44 -0800 Subject: [PATCH 2/6] re-add sync-fork.yml deleted after merge from origin/main --- .github/workflows/sync-fork.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/sync-fork.yml diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml new file mode 100644 index 0000000000..7266989f0f --- /dev/null +++ b/.github/workflows/sync-fork.yml @@ -0,0 +1,19 @@ +name: Sync Fork + +on: + schedule: + - cron: '*/60 * * * *' # run hourly + workflow_dispatch: # or run on button click + +jobs: + sync: + + runs-on: ubuntu-latest + + steps: + - uses: tgymnich/fork-sync@v1.6.3 + with: + token: ${{ secrets.SYNC_FORK_TOKEN }} + owner: microsoft + base: main + head: main From 84a5d698a0845e578ed18fea4d20637a8aafc44f Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 11 Jan 2023 15:48:32 -0800 Subject: [PATCH 3/6] Update README.md TEST --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 010148dd3a..8284a41da3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # OneFuzz - +TEST [![Onefuzz build status](https://github.com/microsoft/onefuzz/workflows/Build/badge.svg?branch=main)](https://github.com/microsoft/onefuzz/actions/workflows/ci.yml?query=branch%3Amain) ## A self-hosted Fuzzing-As-A-Service platform From 3b841b29d8d50da242844f9ae83a5341753b8860 Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 11 Jan 2023 15:49:04 -0800 Subject: [PATCH 4/6] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8284a41da3..e3ab7544d4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # OneFuzz -TEST [![Onefuzz build status](https://github.com/microsoft/onefuzz/workflows/Build/badge.svg?branch=main)](https://github.com/microsoft/onefuzz/actions/workflows/ci.yml?query=branch%3Amain) ## A self-hosted Fuzzing-As-A-Service platform From 3feaf91e339c875b9ad523737f5c635d212dc3ee Mon Sep 17 00:00:00 2001 From: Adam <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Wed, 22 Feb 2023 11:40:58 -0800 Subject: [PATCH 5/6] Update sync-fork.yml bump ver to 1.8 --- .github/workflows/sync-fork.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml index 7266989f0f..24693c794e 100644 --- a/.github/workflows/sync-fork.yml +++ b/.github/workflows/sync-fork.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: tgymnich/fork-sync@v1.6.3 + - uses: tgymnich/fork-sync@v1.8 with: token: ${{ secrets.SYNC_FORK_TOKEN }} owner: microsoft From b68e542361c55c613e65376d3bf90b2d92cd9c28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 01:28:30 +0000 Subject: [PATCH 6/6] Bump procfs from 0.12.0 to 0.15.1 in /src/agent Bumps [procfs](https://github.com/eminence/procfs) from 0.12.0 to 0.15.1. - [Release notes](https://github.com/eminence/procfs/releases) - [Commits](https://github.com/eminence/procfs/compare/v0.12.0...v0.15.1) --- updated-dependencies: - dependency-name: procfs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/agent/Cargo.lock | 6 +++--- src/agent/coverage/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index bfc9280716..2260d2eb24 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -2330,16 +2330,16 @@ dependencies = [ [[package]] name = "procfs" -version = "0.12.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104" +checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f" dependencies = [ "bitflags", "byteorder", "flate2", "hex", "lazy_static", - "libc", + "rustix", ] [[package]] diff --git a/src/agent/coverage/Cargo.toml b/src/agent/coverage/Cargo.toml index 0e7c0c7b5a..1ada17083b 100644 --- a/src/agent/coverage/Cargo.toml +++ b/src/agent/coverage/Cargo.toml @@ -25,7 +25,7 @@ debugger = { path = "../debugger" } pete = "0.9" # For procfs, opt out of the `chrono` freature; it pulls in an old version # of `time`. We do not use the methods that the `chrono` feature enables. -procfs = { version = "0.12", default-features = false, features = ["flate2"] } +procfs = { version = "0.15", default-features = false, features = ["flate2"] } [dev-dependencies] clap = { version = "4.0", features = ["derive"] }