Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure nightly test advances to the correct commit #3210

Merged
merged 1 commit into from
Mar 31, 2022

Conversation

sevanspowell
Copy link
Contributor

Comments

  • The push-branch.sh script needs to advance the linux-tests-pass branch from it's current revision, to the revision the nightly tests were just run on (HEAD).
  • git show-ref -s HEAD doesn't return HEAD, but refs/remotes/origin/HEAD, i.e. the current revision of the default branch (master). Sometimes this lines up with the revision the nightly tests were just run on (HEAD), but sometimes it does not.
  • Use instead git rev-parse --verify HEAD, which always returns HEAD, not refs/remotes/origin/HEAD.

Issue Number

ADP-1584

- The push-branch.sh script needs to advance the linux-tests-pass branch from
  it's current revision, to the revision the nightly tests were just run
  on (HEAD).
- `git show-ref -s HEAD` doesn't return HEAD, but refs/remotes/origin/HEAD, i.e.
  the current revision of the default branch (master). Sometimes this lines up
  with the revision the nightly tests were just run on (HEAD), but sometimes it
  does not.
- Use instead `git rev-parse --verify HEAD`, which always returns HEAD, not
  refs/remotes/origin/HEAD.
@sevanspowell
Copy link
Contributor Author

sevanspowell commented Mar 31, 2022

Note that the -s flag in git show-ref -s HEAD is used to return just the SHA, not the name of the reference (e.g. HEAD or /refs/remotes/origin/HEAD). rev-parse already returns just the SHA and so -s isn't needed.

@sevanspowell
Copy link
Contributor Author

bors try

iohk-bors bot added a commit that referenced this pull request Mar 31, 2022
Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

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

Nice find

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 31, 2022

try

Build failed:

@sevanspowell
Copy link
Contributor Author

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 31, 2022

Build succeeded:

@iohk-bors iohk-bors bot merged commit aa85d19 into master Mar 31, 2022
@iohk-bors iohk-bors bot deleted the sevanspowell/adp-1584-fix-nightly-test-advance branch March 31, 2022 07:44
WilliamKingNoel-Bot pushed a commit that referenced this pull request Mar 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants