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/7] 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/7] 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/7] 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/7] 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/7] 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 2754cc3bddf83b294bc2be643c5d6e20305951fe Mon Sep 17 00:00:00 2001 From: AdamL-Microsoft <103067949+AdamL-Microsoft@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:59:35 -0700 Subject: [PATCH 6/7] restore line break --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e3ab7544d4..010148dd3a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # OneFuzz + [![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 7e292fa66fcba91d22973defdb43ce432fa663d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 05:13:27 +0000 Subject: [PATCH 7/7] Bump nix from 0.25.0 to 0.26.2 in /src/agent Bumps [nix](https://github.com/nix-rust/nix) from 0.25.0 to 0.26.2. - [Release notes](https://github.com/nix-rust/nix/releases) - [Changelog](https://github.com/nix-rust/nix/blob/v0.26.2/CHANGELOG.md) - [Commits](https://github.com/nix-rust/nix/compare/v0.25.0...v0.26.2) --- updated-dependencies: - dependency-name: nix dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/agent/Cargo.lock | 41 +++++++++++++++++++++++------- src/agent/onefuzz-agent/Cargo.toml | 2 +- src/agent/onefuzz/Cargo.toml | 2 +- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index fdee0ea95d..0e17257ec5 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -543,7 +543,7 @@ dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", - "memoffset", + "memoffset 0.6.4", "scopeguard", ] @@ -617,7 +617,7 @@ version = "3.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" dependencies = [ - "nix", + "nix 0.25.1", "winapi 0.3.9", ] @@ -1673,6 +1673,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.16" @@ -1802,18 +1811,32 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "nix" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", "bitflags", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.4", "pin-utils", ] +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + [[package]] name = "nom" version = "5.1.2" @@ -1940,7 +1963,7 @@ dependencies = [ "input-tester", "lazy_static", "log", - "nix", + "nix 0.26.2", "notify", "onefuzz-telemetry", "pete", @@ -1986,7 +2009,7 @@ dependencies = [ "futures", "ipc-channel", "log", - "nix", + "nix 0.26.2", "onefuzz", "onefuzz-telemetry", "reqwest", @@ -2279,8 +2302,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "493eb0f2954de9a30ee85b01891f6519e9d065464eaab79aff65d949f44b7850" dependencies = [ "libc", - "memoffset", - "nix", + "memoffset 0.6.4", + "nix 0.25.1", "thiserror", ] diff --git a/src/agent/onefuzz-agent/Cargo.toml b/src/agent/onefuzz-agent/Cargo.toml index 824601d6a2..09a9c0f639 100644 --- a/src/agent/onefuzz-agent/Cargo.toml +++ b/src/agent/onefuzz-agent/Cargo.toml @@ -35,7 +35,7 @@ dynamic-library = { path = "../dynamic-library" } [target.'cfg(target_family = "unix")'.dependencies] users = "0.11" -nix = "0.25" +nix = "0.26" [target.'cfg(target_family = "windows")'.dependencies] winapi = "0.3" diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/Cargo.toml index abcd4ed0b8..d5992050e4 100644 --- a/src/agent/onefuzz/Cargo.toml +++ b/src/agent/onefuzz/Cargo.toml @@ -55,7 +55,7 @@ winapi = { version = "0.3", features = ["impl-default", "psapi"] } [target.'cfg(target_family = "unix")'.dependencies] cpp_demangle = "0.4" -nix = "0.25" +nix = "0.26" [target.'cfg(target_os = "linux")'.dependencies] pete = "0.9"