Skip to content

Conversation

@DilumAluthge
Copy link
Member

No description provided.

@DilumAluthge DilumAluthge added ci Continuous integration backport 1.6 Change should be backported to release-1.6 backport 1.7 labels Sep 28, 2021
@DilumAluthge DilumAluthge requested a review from a team as a code owner September 28, 2021 04:24
@DilumAluthge DilumAluthge removed the request for review from a team September 28, 2021 04:24
@DilumAluthge DilumAluthge force-pushed the dpa/buildkite-merge-commit branch from da4b295 to 09d5a12 Compare September 28, 2021 05:06
@DilumAluthge DilumAluthge force-pushed the dpa/buildkite-merge-commit branch from 09d5a12 to fb42d78 Compare September 28, 2021 05:18
@DilumAluthge
Copy link
Member Author

DilumAluthge commented Sep 28, 2021

@staticfloat If master advances after the packager starts (but before the tester starts), the SHA of the merge commit changes. Then when the tester tries to download the artifact, it has a different filename than the file uploaded by the packager.

@DilumAluthge
Copy link
Member Author

What we really want is a way to:

  1. At the beginning of the build, get the SHA of the merge commit.
  2. Use that same SHA for all jobs in the build, regardless of when they start.

@staticfloat
Copy link
Member

Easiest fix; just use wildcards with buildkite-agent artifact download.

@DilumAluthge
Copy link
Member Author

Easiest fix; just use wildcards with buildkite-agent artifact download.

Yeah I think this is the easiest solution. I'll also have to use wildcards a few other places, e.g. when I rename julia-COMMIT-linux64.tar.gz to julia-latest-linux64.tar.gz before uploading it to S3.

@giordano
Copy link
Member

What happens if there is a merge conflict?

@DilumAluthge
Copy link
Member Author

What happens if there is a merge conflict?

On other CI providers (e.g. Travis), CI will not start if there is a merge conflict.

For us, we can decide whether we want to:

  1. Error out.
  2. Run CI on the PR head branch instead.

Copy link
Member

@staticfloat staticfloat left a comment

Choose a reason for hiding this comment

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

I vote that we error out if we can't find a merge commit.

@DilumAluthge
Copy link
Member Author

I'm closing this PR in favor of using the new plugin: https://github.com/JuliaCI/merge-commit-buildkite-plugin

@DilumAluthge DilumAluthge deleted the dpa/buildkite-merge-commit branch November 16, 2021 01:31
@KristofferC KristofferC removed the backport 1.6 Change should be backported to release-1.6 label Nov 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci Continuous integration

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants