Skip to content

Commit

Permalink
Fix poorly understood stdout redirection issue. (#17471)
Browse files Browse the repository at this point in the history
- Revert "Bump futures from 0.3.21 to 0.3.23 in /src/rust/engine (#16822)"
  This reverts commit e30eaef.
- Add a test to prevent this regressing on a future upgrade.

Fixes #17470.
  • Loading branch information
benjyw authored Nov 5, 2022
1 parent 6275d8b commit 7de8661
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 30 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/test-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ jobs:
'
- name: Bootstrap Pants
run: './pants --version
'
run: ./pants version > ${{ runner.temp }}/_pants_version.stdout && [[ -s ${{
runner.temp }}/_pants_version.stdout ]]
- name: Run smoke tests
run: './pants list ::
Expand Down Expand Up @@ -179,9 +178,8 @@ jobs:
'
- name: Bootstrap Pants
run: './pants --version
'
run: ./pants version > ${{ runner.temp }}/_pants_version.stdout && [[ -s ${{
runner.temp }}/_pants_version.stdout ]]
- name: Run smoke tests
run: './pants list ::
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ jobs:
'
- name: Bootstrap Pants
run: './pants --version
'
run: ./pants version > ${{ runner.temp }}/_pants_version.stdout && [[ -s ${{
runner.temp }}/_pants_version.stdout ]]
- name: Run smoke tests
run: './pants list ::
Expand Down Expand Up @@ -184,9 +183,8 @@ jobs:
'
- name: Bootstrap Pants
run: './pants --version
'
run: ./pants version > ${{ runner.temp }}/_pants_version.stdout && [[ -s ${{
runner.temp }}/_pants_version.stdout ]]
- name: Run smoke tests
run: './pants list ::
Expand Down
9 changes: 8 additions & 1 deletion build-support/bin/generate_github_workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,14 @@ def bootstrap_pants(self, *, install_python: bool) -> Sequence[Step]:
*setup_primary_python(install_python=install_python),
*self.bootstrap_caches(),
setup_toolchain_auth(),
{"name": "Bootstrap Pants", "run": self.wrap_cmd("./pants --version\n")},
{
"name": "Bootstrap Pants",
# Check for a regression of https://github.com/pantsbuild/pants/issues/17470.
"run": self.wrap_cmd(
f"./pants version > {gha_expr('runner.temp')}/_pants_version.stdout && "
f"[[ -s {gha_expr('runner.temp')}/_pants_version.stdout ]]"
),
},
{
"name": "Run smoke tests",
"run": dedent(
Expand Down
32 changes: 16 additions & 16 deletions src/rust/engine/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/engine/fs/store/src/snapshot_ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ async fn render_merge_error<T: SnapshotOps + 'static>(
///
#[async_trait]
pub trait SnapshotOps: Clone + Send + Sync + 'static {
type Error: Debug + Display + From<String> + Send;
type Error: Debug + Display + From<String>;

async fn load_file_bytes_with<
T: Send + 'static,
Expand Down

0 comments on commit 7de8661

Please sign in to comment.