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

Run on.push only for master #2968

Merged
merged 3 commits into from
Sep 14, 2023

Conversation

Mo-Fatah
Copy link
Collaborator

@Mo-Fatah Mo-Fatah commented Sep 13, 2023

Fixes #2959

  • If a PR was originated from a branch from the upstream repo (not from a fork), this will trigger both the pull_request and the push workflows for this PR at the same time resulting in a duplicated CI checks.
  • The not-** workflows are no longer needed

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>
@Mo-Fatah Mo-Fatah added component/CI CI related changes component/contribex Contribution Experience labels Sep 13, 2023
Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>
@Sharpz7
Copy link
Contributor

Sharpz7 commented Sep 14, 2023

I am very keen to make sure we monitor PR's to make sure this doesn't do anything. Its been like this since the days of Jay being around - I doubt he did it without a reason.

This said, I think whats happened it github has changed their definition of whats triggers a "push" and "PR" action, and that is what has caused this.

@Sharpz7 Sharpz7 enabled auto-merge (squash) September 14, 2023 19:53
@Sharpz7 Sharpz7 merged commit babce23 into armadaproject:master Sep 14, 2023
12 checks passed
svc-gh-ghzonetrans-p pushed a commit that referenced this pull request Sep 19, 2023
* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Bump armada airflow operator to version 0.5.4 (#2961)

* Bump armada airflow operator to version 0.5.4

Signed-off-by: Rich Scott <richscott@sent.com>

* Regenerate Airflow Operator Markdown doc.

Signed-off-by: Rich Scott <richscott@sent.com>

* Fix regenerated Airflow doc error.

Signed-off-by: Rich Scott <richscott@sent.com>

* Pin versions of all modules, especially around docs generation.

Signed-off-by: Rich Scott <richscott@sent.com>

* Regenerate Airflow docs using Python 3.10

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Infer failed jobs from job context, tidy up

* Infer failed jobs from job context, tidy up

* Magefile: Clean all Makefile refernces (#2957)

* tiny naming change

* clean all make refernces

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

---------

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* Infer failed jobs from job context, tidy up

* Revert to previous unpinned airflow version spec. (#2967)

* Revert to previous unpinned airflow version spec.

Signed-off-by: Rich Scott <richscott@sent.com>

* Increment armada-airflow module version.

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Update jobdb with any excess gang jobs that failed

* ArmadaContext.Log Improvements (#2965)

* log error

* context log

* context log

* add cycle id

* typo

* lint

* refactor armadacontext to implement a FieldLogger

---------

Co-authored-by: Chris Martin <chris@cmartinit.co.uk>

* Fix-up existing tests before adding new ones

* Add new tests for minimum gang sizes

* Test that excess failed gang jobs are committed to jobdb

* Run `on.push` only for master (#2968)

* Run On Push only for master

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* remove not-workflows

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

---------

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* Add test for failed job pulsar messages

* Tidy tests

* WIP: Airflow: fix undefined poll_interval in Deferrable Operator (#2975)

* Airflow: handle poll_interval attr in ArmadaJobCompleteTrigger

Fix incomplete handling of 'poll_interval' attribute in
ArmadaJobCompleteTrigger, used by the Armada Deferrable Operator for
Airflow.

Signed-off-by: Rich Scott <richscott@sent.com>

* Airflow - add unit test for armada deferrable operator

Run much of the same tests for the deferrable operator as for the
regular operator, plus test serialization.  Also, update interval
signifier in examples. A full test of the deferrable operator that
verifies the trigger handling is still needed.

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Release Airflow Operator v0.5.6 (#2979)

Signed-off-by: Rich Scott <richscott@sent.com>

* #2905 - fix indentation (#2971)

Co-authored-by: Mohamed Abdelfatah <39927413+Mo-Fatah@users.noreply.github.com>
Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>

Signed-off-by: Rich Scott <richscott@sent.com>
Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>
Co-authored-by: Rich Scott <rich@gr-oss.io>
Co-authored-by: Mohamed Abdelfatah <39927413+Mo-Fatah@users.noreply.github.com>
Co-authored-by: Chris Martin <council_tax@hotmail.com>
Co-authored-by: Chris Martin <chris@cmartinit.co.uk>
Co-authored-by: Dave Gantenbein <dave@gr-oss.io>
Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>
@Mo-Fatah Mo-Fatah deleted the fix-repeat-workflows branch September 19, 2023 14:45
severinson added a commit that referenced this pull request Oct 9, 2023
* Wire in min cardinality (#8)

* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Wire up minimum gang cardinality

* Bump armada airflow operator to version 0.5.4 (#2961)

* Bump armada airflow operator to version 0.5.4

Signed-off-by: Rich Scott <richscott@sent.com>

* Regenerate Airflow Operator Markdown doc.

Signed-off-by: Rich Scott <richscott@sent.com>

* Fix regenerated Airflow doc error.

Signed-off-by: Rich Scott <richscott@sent.com>

* Pin versions of all modules, especially around docs generation.

Signed-off-by: Rich Scott <richscott@sent.com>

* Regenerate Airflow docs using Python 3.10

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Infer failed jobs from job context, tidy up

* Infer failed jobs from job context, tidy up

* Magefile: Clean all Makefile refernces (#2957)

* tiny naming change

* clean all make refernces

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

---------

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* Infer failed jobs from job context, tidy up

* Revert to previous unpinned airflow version spec. (#2967)

* Revert to previous unpinned airflow version spec.

Signed-off-by: Rich Scott <richscott@sent.com>

* Increment armada-airflow module version.

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Only fail gang jobs when the overall gang min cardinality is set. Fix error handling

* Update jobdb with any excess gang jobs that failed

* ArmadaContext.Log Improvements (#2965)

* log error

* context log

* context log

* add cycle id

* typo

* lint

* refactor armadacontext to implement a FieldLogger

---------

Co-authored-by: Chris Martin <chris@cmartinit.co.uk>

* Fix-up existing tests before adding new ones

* Add new tests for minimum gang sizes

* Test that excess failed gang jobs are committed to jobdb

* Run `on.push` only for master (#2968)

* Run On Push only for master

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* remove not-workflows

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

---------

Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>

* Add test for failed job pulsar messages

* Tidy tests

* WIP: Airflow: fix undefined poll_interval in Deferrable Operator (#2975)

* Airflow: handle poll_interval attr in ArmadaJobCompleteTrigger

Fix incomplete handling of 'poll_interval' attribute in
ArmadaJobCompleteTrigger, used by the Armada Deferrable Operator for
Airflow.

Signed-off-by: Rich Scott <richscott@sent.com>

* Airflow - add unit test for armada deferrable operator

Run much of the same tests for the deferrable operator as for the
regular operator, plus test serialization.  Also, update interval
signifier in examples. A full test of the deferrable operator that
verifies the trigger handling is still needed.

Signed-off-by: Rich Scott <richscott@sent.com>

---------

Signed-off-by: Rich Scott <richscott@sent.com>

* Release Airflow Operator v0.5.6 (#2979)

Signed-off-by: Rich Scott <richscott@sent.com>

* #2905 - fix indentation (#2971)

Co-authored-by: Mohamed Abdelfatah <39927413+Mo-Fatah@users.noreply.github.com>
Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>

Signed-off-by: Rich Scott <richscott@sent.com>
Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>
Co-authored-by: Rich Scott <rich@gr-oss.io>
Co-authored-by: Mohamed Abdelfatah <39927413+Mo-Fatah@users.noreply.github.com>
Co-authored-by: Chris Martin <council_tax@hotmail.com>
Co-authored-by: Chris Martin <chris@cmartinit.co.uk>
Co-authored-by: Dave Gantenbein <dave@gr-oss.io>
Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>

* Remove unintentional diffs

* Run formatting tools

* Fix formatting

* Re-run proto gen + dotnet gen

* Validate gang min cardinality is <= gang cardinality

* mage proto

* Tidying

---------

Signed-off-by: Rich Scott <richscott@sent.com>
Signed-off-by: mohamed <mohamedabdelfatah2027@gmail.com>
Co-authored-by: Mark Sumner <Mark.Sumner@gresearch.co.uk>
Co-authored-by: Rich Scott <rich@gr-oss.io>
Co-authored-by: Mohamed Abdelfatah <39927413+Mo-Fatah@users.noreply.github.com>
Co-authored-by: Chris Martin <council_tax@hotmail.com>
Co-authored-by: Chris Martin <chris@cmartinit.co.uk>
Co-authored-by: Dave Gantenbein <dave@gr-oss.io>
Co-authored-by: Adam McArthur <46480158+Sharpz7@users.noreply.github.com>
Co-authored-by: Albin Severinson <albin@severinson.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/CI CI related changes component/contribex Contribution Experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove duplicated CI jobs
3 participants