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

Misc fixes to the caching logic #4373

Merged
merged 1 commit into from
Jun 29, 2024
Merged

Conversation

graydon
Copy link
Contributor

@graydon graydon commented Jun 28, 2024

This fixes several different minor issues in caching:

  • Caches the whole .cargo directory, including bins
  • Caches the new (moved) location of the rust target dir
  • Turns off the scheduled cache-priming runs, they're not needed
  • Explicitly limits cache-writes to happen on master instead
  • Eliminates a redundant (harmless but noisy) attempted cache-write when running the two different 'scenario' matrix variants

This fixes several different minor issues in caching:

  - Caches the whole .cargo directory, including bins
  - Caches the new (moved) location of the rust target dir
  - Turns off the scheduled cache-priming runs, they're not needed
  - Explicitly limits cache-writes to happen on master instead
  - Eliminates a redundant (harmless but noisy) attempted cache-write
    when running the two different 'scenario' matrix variants
@graydon graydon enabled auto-merge June 28, 2024 23:20
@graydon graydon added this pull request to the merge queue Jun 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 29, 2024
@graydon graydon added this pull request to the merge queue Jun 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 29, 2024
@graydon graydon added this pull request to the merge queue Jun 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 29, 2024
@graydon graydon added this pull request to the merge queue Jun 29, 2024
Merged via the queue into stellar:master with commit dfb7cdc Jun 29, 2024
14 checks passed
@graydon graydon deleted the disable-scheduled-ci branch June 29, 2024 09:22
github-merge-queue bot pushed a commit that referenced this pull request Jul 1, 2024
This is a followup to #4373
fixing yet another issue that seems to be happening with merge queues,
it's visible in this screenshot:

![image](https://github.com/stellar/stellar-core/assets/14097/a9fda27f-dc0c-4456-a948-9046c92efce7)

I believe what's happening here is that the merge queue machinery is
kicking off _two_ separate groups of actions simultaneously, one
corresponding to the `push` event on the temporary integration branch,
and the other corresponding to the `merge_group` event "Merge group
checks requested". We should really only be triggering on the
`merge_group` event, so this PR limits the `push` events that trigger
actions to only the _final_ pushes when the integration branch closes
and the queue pushes to master (which is still a somewhat redundant
build, but the only way we can ensure the cache gets rewritten, and
anyways it's only _two_ action-triggers per PR, vs. the current
_three_).

(Also note this is really a copy-paste mistake on my part, Leigh did
this correctly on the soroban repos)
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