Unverified Commit 959d4293 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Refactor the `sdk-sync` tool to sync commits in parallel (#1357) 

* Fix tests on MacOS

* Sync smithy-rs commits in parallel
parent 3aab8274

tools/sdk-sync/Cargo.lock

+126 −0
Original line number Diff line number Diff line
@@ -96,6 +96,57 @@ dependencies = [ 
 "syn",

]



[[package]]

name = "core-foundation-sys"

version = "0.8.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"



[[package]]

name = "crossbeam-channel"

version = "0.5.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"

dependencies = [

 "cfg-if",

 "crossbeam-utils",

]



[[package]]

name = "crossbeam-deque"

version = "0.8.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"

dependencies = [

 "cfg-if",

 "crossbeam-epoch",

 "crossbeam-utils",

]



[[package]]

name = "crossbeam-epoch"

version = "0.9.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"

dependencies = [

 "autocfg",

 "cfg-if",

 "crossbeam-utils",

 "lazy_static",

 "memoffset",

 "scopeguard",

]



[[package]]

name = "crossbeam-utils"

version = "0.8.8"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"

dependencies = [

 "cfg-if",

 "lazy_static",

]



[[package]]

name = "ctor"

version = "0.1.21"
@@ -254,6 +305,15 @@ version = "2.4.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"



[[package]]

name = "memoffset"

version = "0.6.5"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"

dependencies = [

 "autocfg",

]



[[package]]

name = "mockall"

version = "0.11.0"
@@ -287,6 +347,15 @@ version = "0.3.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"



[[package]]

name = "ntapi"

version = "0.3.7"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"

dependencies = [

 "winapi",

]



[[package]]

name = "num-traits"

version = "0.2.14"
@@ -296,6 +365,16 @@ dependencies = [ 
 "autocfg",

]



[[package]]

name = "num_cpus"

version = "1.13.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"

dependencies = [

 "hermit-abi",

 "libc",

]



[[package]]

name = "once_cell"

version = "1.10.0"
@@ -410,6 +489,30 @@ dependencies = [ 
 "proc-macro2",

]



[[package]]

name = "rayon"

version = "1.5.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"

dependencies = [

 "autocfg",

 "crossbeam-deque",

 "either",

 "rayon-core",

]



[[package]]

name = "rayon-core"

version = "1.9.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"

dependencies = [

 "crossbeam-channel",

 "crossbeam-deque",

 "crossbeam-utils",

 "num_cpus",

]



[[package]]

name = "redox_syscall"

version = "0.2.13"
@@ -454,6 +557,12 @@ dependencies = [ 
 "winapi",

]



[[package]]

name = "scopeguard"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"



[[package]]

name = "sdk-sync"

version = "0.1.0"
@@ -462,11 +571,14 @@ dependencies = [ 
 "clap",

 "gitignore",

 "mockall",

 "num_cpus",

 "once_cell",

 "pretty_assertions",

 "rayon",

 "regex",

 "serde",

 "smithy-rs-tool-common",

 "sysinfo",

 "tempfile",

 "toml",

 "tracing",
@@ -536,6 +648,20 @@ dependencies = [ 
 "unicode-xid",

]



[[package]]

name = "sysinfo"

version = "0.23.11"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3bf915673a340ee41f2fc24ad1286c75ea92026f04b65a0d0e5132d80b95fc61"

dependencies = [

 "cfg-if",

 "core-foundation-sys",

 "libc",

 "ntapi",

 "once_cell",

 "winapi",

]



[[package]]

name = "tempfile"

version = "3.3.0"

tools/sdk-sync/Cargo.toml

+4 −0
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ opt-level = 0 
anyhow = "1.0.56"

clap = { version = "3.1.8", features = ["derive"] }

gitignore = "1.0.7"

num_cpus = "1.13.1"

rayon = "1.5.2"

serde = { version = "1.0.136", features = ["derive"] }

smithy-rs-tool-common = { version = "0.1", path = "../smithy-rs-tool-common" }

sysinfo = { version = "0.23.11", default-features = false }

tempfile = "3.3.0"

toml = "0.5.9"

tracing = "0.1.34"

tracing-attributes = "0.1.20"

tools/sdk-sync/fake-cli/git-changed-files

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
import os

import sys



expected = ["/tmp", ["diff", "--name-only"]]

expected = [os.path.realpath("/tmp"), ["diff", "--name-only"]]

actual = [os.getcwd(), sys.argv[1:]]

if expected != actual:

    print(f"ERROR\nExpect: {expected}\nActual: {actual}")

tools/sdk-sync/fake-cli/git-changed-files-empty

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
import os

import sys



expected = ["/tmp", ["diff", "--name-only"]]

expected = [os.path.realpath("/tmp"), ["diff", "--name-only"]]

actual = [os.getcwd(), sys.argv[1:]]

if expected != actual:

    print(f"ERROR\nExpect: {expected}\nActual: {actual}")

tools/sdk-sync/fake-cli/git-clone

0 → 100755
+11 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python3

import os

import sys



expected = [os.path.realpath("/tmp"), [

    "clone", "/tmp",

]]

actual = [os.getcwd(), sys.argv[1:]]

if expected != actual:

    print(f"ERROR\nExpect: {expected}\nActual: {actual}")

    sys.exit(1)