Skip to content

contrib/check-config.sh: Remove awk dependency#42409

Merged
samuelkarp merged 1 commit intomoby:masterfrom
joakimr-axis:joakimr-axis_noawk
Jun 3, 2021
Merged

contrib/check-config.sh: Remove awk dependency#42409
samuelkarp merged 1 commit intomoby:masterfrom
joakimr-axis:joakimr-axis_noawk

Conversation

@joakimr-axis
Copy link
Copy Markdown
Contributor

@joakimr-axis joakimr-axis commented May 24, 2021

- What I did
Remove awk dependency in contrib/check-config.sh

- How I did it
Use grep and built-in functionality

- How to verify it
Run on host without awk

- Description for the changelog

Remove awk dependency in contrib/check-config.sh

- A picture of a cute animal (not mandatory but encouraged)

image

@joakimr-axis
Copy link
Copy Markdown
Contributor Author

I see that the Recursively delete the current directory from the workspace part in https://ci-next.docker.com/public/blue/organizations/jenkins/moby/detail/PR-42409/2/pipeline fails. I don't think that step is related to the changes in this PR and should not be expected to fail?

@thaJeztah thaJeztah added area/contrib kind/refactor PR's that refactor, or clean-up code status/2-code-review labels May 25, 2021
@thaJeztah
Copy link
Copy Markdown
Member

I see that the Recursively delete the current directory from the workspace part in https://ci-next.docker.com/public/blue/organizations/jenkins/moby/detail/PR-42409/2/pipeline fails. I don't think that step is related to the changes in this PR and should not be expected to fail?

Yes, shouldn't be related; I restarted CI

@thaJeztah
Copy link
Copy Markdown
Member

@tianon PTAL

@joakimr-axis
Copy link
Copy Markdown
Contributor Author

I see that the Recursively delete the current directory from the workspace part in https://ci-next.docker.com/public/blue/organizations/jenkins/moby/detail/PR-42409/2/pipeline fails. I don't think that step is related to the changes in this PR and should not be expected to fail?

Yes, shouldn't be related; I restarted CI

Strange, the same issue with Recursively delete the current directory from the workspace now with the new run too.

Comment thread contrib/check-config.sh Outdated
Comment thread contrib/check-config.sh Outdated
Comment thread contrib/check-config.sh Outdated
The awk dependency is an issue when running check-config.sh on systems
without awk. The use of awk can be replaced with sed, which improves
portability.

The PR code review discussion iterated via grep to this final sed
version that is all Tianon Gravi's art.

Co-authored-by: Tianon Gravi <[email protected]>
Signed-off-by: Joakim Roubert <[email protected]>
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you!

@samuelkarp
Copy link
Copy Markdown
Member

FAIL: libnetwork/iptables TestConcurrencyNoWait (0.18s) a couple times on arm64: #42458

Copy link
Copy Markdown
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@samuelkarp samuelkarp merged commit a2343c8 into moby:master Jun 3, 2021
@joakimr-axis joakimr-axis deleted the joakimr-axis_noawk branch June 4, 2021 07:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/contrib kind/refactor PR's that refactor, or clean-up code status/4-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants