Skip to content

Largely revert "Merge pull request #16776 from chrysn-pull-requests/shell-make-fixes-2"#16804

Closed
chrysn wants to merge 1 commit intoRIOT-OS:masterfrom
chrysn-pull-requests:revert-16776
Closed

Largely revert "Merge pull request #16776 from chrysn-pull-requests/shell-make-fixes-2"#16804
chrysn wants to merge 1 commit intoRIOT-OS:masterfrom
chrysn-pull-requests:revert-16776

Conversation

@chrysn
Copy link
Copy Markdown
Member

@chrysn chrysn commented Sep 3, 2021

This reverts commit d4ed42a, reversing
changes made to 2bf1202.

Additions to the checks are left in place, but disabled while the
current state would not pass them.

Sorry, I messed up there -- this should get things going again. (More text when the PR is sent and tests are running in parallel).

@chrysn
Largely revert "Merge pull request RIOT-OS#16776 from chrysn-pull-req…
c08c098 
…uests/shell-make-fixes-2"

This reverts commit d4ed42a, reversing
changes made to 2bf1202.

Additions to the checks are left in place, but disabled while the
current state would not pass them.
@github-actions github-actions bot added Area: build system Area: Build system Area: pkg Area: External package ports Area: tools Area: Supplementary tools Platform: RISC-V Platform: This PR/issue effects RISC-V-based platforms labels Sep 3, 2021
@chrysn chrysn added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed Area: pkg Area: External package ports Area: tools Area: Supplementary tools Platform: RISC-V Platform: This PR/issue effects RISC-V-based platforms labels Sep 3, 2021
@chrysn chrysn mentioned this pull request Sep 3, 2021
Merged
@miri64 miri64 mentioned this pull request Sep 3, 2021
Merged
@benpicco benpicco requested review from fjmolinas and miri64 September 3, 2021 09:37
@miri64
Copy link
Copy Markdown
Member

miri64 commented Sep 3, 2021

Sorry, I messed up there -- this should get things going again. (More text when the PR is sent and tests are running in parallel).

Sad the summit isn't in person. I'm sure everyone would have liked a fresh beer ;-P

@chrysn
Copy link
Copy Markdown
Member Author

chrysn commented Sep 3, 2021

Ok, nope: this still fails one of the introduced checks (I thought I had caught them all in the first PR). Thus lets' go with yours and cancel this run.

(And yes, I definitely do owe a round).

@chrysn chrysn removed the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Sep 3, 2021
@chrysn
Copy link
Copy Markdown
Member Author

chrysn commented Sep 3, 2021

(For posteriority, build_system_sanity_check/check.sh erred out with:

 Command output:
  
  	Invalid build system patterns found by ./dist/tools/buildsystem_sanity_check/check.sh:
  	Redirecting stderr and stdout to /dev/null is `>/dev/null 2>&1`; the other way round puts the old stderr to the new stdout.:
  		dist/testbed-support/makefile.iotlab.single.inc.mk:60:ifneq (0,$(shell command -v iotlab-experiment -h 2>&1 > /dev/null ; echo $$?))
  	Redirecting stderr and stdout to /dev/null is `>/dev/null 2>&1`; the other way round puts the old stderr to the new stdout.:
  		dist/testbed-support/makefile.iotlab.single.inc.mk:69:    ifneq (0,$(shell command -v iotlab-ssh -h 2>&1 > /dev/null ; echo $$?))
  
  Error: Redirecting stderr and stdout to /dev/null is `>/dev/null 2>&1`; the other way round puts the old stderr to the new stdout.
  Error: Redirecting stderr and stdout to /dev/null is `>/dev/null 2>&1`; the other way round puts the old stderr to the new stdout.

so I cancelled this one's murdock run in favor of #16803, which also has a nicer commit message)

Closing this.

@chrysn chrysn closed this Sep 3, 2021
@miri64
Copy link
Copy Markdown
Member

miri64 commented Sep 3, 2021

[…] in favor of #16803, which also has a nicer commit message)

The wonders a Revert button in Github can do ^^

@chrysn chrysn deleted the revert-16776 branch September 3, 2021 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@miri64 miri64 Awaiting requested review from miri64

@fjmolinas fjmolinas Awaiting requested review from fjmolinas

Assignees

No one assigned

Labels

Area: build system Area: Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@chrysn @miri64