Skip to content

Commit

Permalink
[internal] Fix missed workflow regeneration, and validate workflow ge…
Browse files Browse the repository at this point in the history
…neration moving forward. (#12564)

Fix missed workflow regeneration from #12560, and validate workflow generation moving forward.

[ci skip-rust]
[ci skip-build-wheels]
  • Loading branch information
stuhood authored Aug 13, 2021
1 parent 0160c6f commit 6d7d46b
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/test-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ jobs:
- name: Bootstrap Pants
run: './pants --version
'
- name: Validate CI config
run: './pants run build-support/bin/generate_github_workflows.py -- --check
'
- name: Run smoke tests
run: './pants list ::
Expand Down Expand Up @@ -149,6 +153,8 @@ jobs:
./cargo test --all --tests -- --nocapture
./cargo build --benches
'
strategy:
matrix:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ jobs:
- name: Bootstrap Pants
run: './pants --version
'
- name: Validate CI config
run: './pants run build-support/bin/generate_github_workflows.py -- --check
'
- name: Run smoke tests
run: './pants list ::
Expand Down Expand Up @@ -149,6 +153,8 @@ jobs:
./cargo test --all --tests -- --nocapture
./cargo build --benches
'
strategy:
matrix:
Expand Down
8 changes: 8 additions & 0 deletions build-support/bin/generate_github_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,14 @@ def test_workflow_jobs(python_versions: list[str], *, cron: bool) -> Jobs:
*setup_primary_python(),
*bootstrap_caches(),
{"name": "Bootstrap Pants", "run": "./pants --version\n"},
{
"name": "Validate CI config",
"run": dedent(
"""\
./pants run build-support/bin/generate_github_workflows.py -- --check
"""
),
},
{
"name": "Run smoke tests",
"run": dedent(
Expand Down
6 changes: 3 additions & 3 deletions src/rust/engine/fs/store/benches/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ pub fn criterion_benchmark_materialize(c: &mut Criterion) {
let mut cgroup = c.benchmark_group("materialize_directory");

for (count, size) in vec![(100, 100), (20, 10_000_000), (1, 200_000_000)] {
let (store, _tempdir, digest) = large_snapshot(&executor, count, size);
let (store, _tempdir, digest) = snapshot(&executor, count, size);
let parent_dest = TempDir::new().unwrap();
let parent_dest_path = parent_dest.path();
cgroup
Expand All @@ -78,7 +78,7 @@ pub fn criterion_benchmark_materialize(c: &mut Criterion) {
pub fn criterion_benchmark_subset_wildcard(c: &mut Criterion) {
let executor = Executor::global(num_cpus::get(), num_cpus::get() * 4).unwrap();
// NB: We use a much larger snapshot size compared to the materialize benchmark!
let (store, _tempdir, digest) = large_snapshot(&executor, 1000, 100);
let (store, _tempdir, digest) = snapshot(&executor, 1000, 100);

let mut cgroup = c.benchmark_group("digest_subset");

Expand Down Expand Up @@ -106,7 +106,7 @@ pub fn criterion_benchmark_subset_wildcard(c: &mut Criterion) {
pub fn criterion_benchmark_merge(c: &mut Criterion) {
let executor = Executor::global(num_cpus::get(), num_cpus::get() * 4).unwrap();
let num_files: usize = 4000;
let (store, _tempdir, digest) = large_snapshot(&executor, num_files, 100);
let (store, _tempdir, digest) = snapshot(&executor, num_files, 100);

let (directory, _metadata) = executor
.block_on(store.load_directory(digest))
Expand Down

0 comments on commit 6d7d46b

Please sign in to comment.