Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented May 10, 2023

CI_EXEC has many issues:

  • It is roughly equivalent to bash -c "$*", meaning that the full command will be treated as a single string, ignoring tokens.
  • It must be put in front of (almost) every command, making it easy to forget, hard to debug the resulting failure, and the code verbose.

Fix all issues by removing it almost completely.

[WARN] The commit is obviously broken and will not run the CI system. In
the rare case this is hit in a git bisect, just skip the commit.

The goal here was to make it trivial to review with the git option:
--color-moved=dimmed-zebra

It is required to move everything into one file because "exit 0" will
otherwise stop working as intended when the containing bash script is no
longer executed with "source ...".

If there is desire to split up 06_script_b.sh into logical chunks in the
future, it will also be easier after the following commit.
@DrahtBot
Copy link
Contributor

DrahtBot commented May 10, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK TheCharlatan
Concept ACK RandyMcMillan, fanquake

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@DrahtBot DrahtBot changed the title ci: Remove CI_EXEC bloat ci: Remove CI_EXEC bloat May 10, 2023
@DrahtBot DrahtBot added the Tests label May 10, 2023
@maflcko maflcko force-pushed the 2305-ci-exec-bloat- branch from d6a4f7c to 5cad9e8 Compare May 10, 2023 12:19
@RandyMcMillan
Copy link
Contributor

concept ACK

@maflcko maflcko force-pushed the 2305-ci-exec-bloat- branch from 5cad9e8 to fa01c3c Compare May 10, 2023 13:28
@fanquake
Copy link
Member

Concept ACK

bash -c "./configure $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
make "${MAKEJOBS}" && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk
bash -c "${PRINT_CCACHE_STATISTICS}"
exit 0
Copy link
Member Author

Choose a reason for hiding this comment

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

Moving the exit 0 may also fix a bug where the CI Pod for ARM64 Android APK [jammy] is left alive even if the test passed.

@fanquake fanquake requested a review from TheCharlatan May 12, 2023 09:32
Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

ACK fa01c3c

@fanquake fanquake merged commit 3a63ef5 into bitcoin:master May 15, 2023
@maflcko maflcko deleted the 2305-ci-exec-bloat- branch May 15, 2023 10:20
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 15, 2023
fanquake added a commit to bitcoin-core/gui that referenced this pull request May 16, 2023
5d49d98 ci: Fix "Number of CPUs" output (Hennadii Stepanov)

Pull request description:

  This PR is a follow-up to bitcoin/bitcoin#27616:

  - on [master](https://api.cirrus-ci.com/v1/task/5809898840129536/logs/ci.log):
  ```
  Number of CPUs \(nproc\): $(nproc)
  ```

  - this [PR](https://api.cirrus-ci.com/v1/task/6495994095861760/logs/ci.log):
  ```
  Number of CPUs (nproc): 32
  ```

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 5d49d98

Tree-SHA512: d97ee3587dbadb604a381aa9990b58d75441307fc98e7ae674436f8318200c8faef7171348655cdcc3ed360c8ca22eacf063cb430b826a40cb0952a436c511f3
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 17, 2023
5d49d98 ci: Fix "Number of CPUs" output (Hennadii Stepanov)

Pull request description:

  This PR is a follow-up to bitcoin#27616:

  - on [master](https://api.cirrus-ci.com/v1/task/5809898840129536/logs/ci.log):
  ```
  Number of CPUs \(nproc\): $(nproc)
  ```

  - this [PR](https://api.cirrus-ci.com/v1/task/6495994095861760/logs/ci.log):
  ```
  Number of CPUs (nproc): 32
  ```

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 5d49d98

Tree-SHA512: d97ee3587dbadb604a381aa9990b58d75441307fc98e7ae674436f8318200c8faef7171348655cdcc3ed360c8ca22eacf063cb430b826a40cb0952a436c511f3
@bitcoin bitcoin locked and limited conversation to collaborators May 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants