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

fix: Don't abort build_enclave_manager_webapp with abort_job_if_only_docs_changes #2038

Merged
merged 1 commit into from
Jan 10, 2024

Conversation

Dartoxian
Copy link
Contributor

Description:

By aborting build_enclave_manager_webapp with abort_job_if_only_docs_changes the abort will always occur if the build runs on main (as the diff there between main and HEAD will always be empty).

We need build_enclave_manager_webapp to run on main so that it can be consumed by the publish_engine_server_image task.

Is this change user facing?

NO

References (if applicable):

@Dartoxian Dartoxian changed the title Don't abort build_enclave_manager_webapp with abort_job_if_only_docs_changes fix: Don't abort build_enclave_manager_webapp with abort_job_if_only_docs_changes Jan 10, 2024
@Dartoxian Dartoxian added this pull request to the merge queue Jan 10, 2024
Merged via the queue into main with commit 150eb5f Jan 10, 2024
40 of 41 checks passed
@Dartoxian Dartoxian deleted the bgazzard/remove-docs-check-emui-build branch January 10, 2024 18:53
github-merge-queue bot pushed a commit that referenced this pull request Jan 10, 2024
🤖 I have created a release *beep* *boop*
---


##
[0.86.4](0.86.3...0.86.4)
(2024-01-10)


### Bug Fixes

* Don't abort build_enclave_manager_webapp with
abort_job_if_only_docs_changes
([#2038](#2038))
([150eb5f](150eb5f))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: kurtosisbot <kurtosisbot@users.noreply.github.com>
github-merge-queue bot pushed a commit that referenced this pull request Jan 11, 2024
…d tagged commits (#2041)

## Description:
Yesterday we
[removed](#2038) the logic
which skips `build_enclave_manager_webapp` if the build commit diff
against `main` has only docs changes. We did this because we want
`build_enclave_manager_webapp` to run on `main` during publish - so that
commit would always have no diff from `main` (as it would be the same
commit.

This change means that we skip `build_enclave_manager_webapp` only if
the current commit is not tagged and the diff against main has no
changes other than docs changes.

This restores the previous behaviour, with the exception that
`build_enclave_manager_webapp` runs on tagged commits - ie it can run
during publish jobs.

## Is this change user facing?
NO

## References (if applicable):
* #2038
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