Skip to content

SPM: Rebase feature-spm branch on top of master #7157

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

Merged
merged 0 commits into from
Jun 11, 2018
Merged

SPM: Rebase feature-spm branch on top of master #7157

merged 0 commits into from
Jun 11, 2018

Conversation

mikisch81
Copy link
Contributor

Description

Rebase feature-spm on top of master.

Pull request type

[ ] Fix
[X] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 7, 2018

Seems there are conflicts, please review

@mikisch81
Copy link
Contributor Author

@0xc0170 conflicts solved with a merge-commit (which should not be pushed).
Like last time, feature-spm needs to be forced pushed with the 2nd to last commit (which is the actual rebased feature-spm on top of master).

@mikisch81
Copy link
Contributor Author

@0xc0170, travis fails with a package-manager error, how can i re-trigger the travis checks only?

$ sudo add-apt-repository -y ppa:deadsnakes/ppa
Cannot add PPA: 'ppa:deadsnakes/ppa'.
Please check that the PPA name or format is correct.
The command "sudo add-apt-repository -y ppa:deadsnakes/ppa" failed and exited with 1 during .

@mikisch81
Copy link
Contributor Author

@cmonr Can we run CI?

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Jun 7, 2018

Build : ABORTED

Build number : 2277
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7157/

@mikisch81
Copy link
Contributor Author

@cmonr why was the build aborted (I am not near a PC so I can't check)

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

@mikisch81 Sorry about that. Thought I left a comment here. For the moment, we're prioritizing CI for PRs that need to go into RC3, and the current plan is to generate it tomorrow morning. We're pausing CI for all other jobs, and will be restarting it once the other two jobs are on their way.

For reference, this is what the other PRs had on them: #7148 (comment)

@cmonr
Copy link
Contributor

cmonr commented Jun 8, 2018

To make up for the snafu, this'll be the first PR back in!

/morph build

@mikisch81
Copy link
Contributor Author

@0xc0170 Looks like it failed due to some Jenkins problem

@mbed-ci
Copy link

mbed-ci commented Jun 8, 2018

Build : SUCCESS

Build number : 2283
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7157/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@cmonr
Copy link
Contributor

cmonr commented Jun 8, 2018

Pausing CI until 5.9 RC3 completes CI. Will restart jobs when able.

@mikisch81
Copy link
Contributor Author

@cmonr will this PR ever get CI time?
Can we run before rc4 pops in..

@cmonr
Copy link
Contributor

cmonr commented Jun 8, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Jun 8, 2018

Build : SUCCESS

Build number : 2290
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7157/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Jun 8, 2018

@mbed-ci
Copy link

mbed-ci commented Jun 8, 2018

Exporter Build : SUCCESS

Build number : 1907
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7157/

@0xc0170 0xc0170 merged commit 4c68b71 into ARMmbed:feature-spm Jun 11, 2018
@mikisch81 mikisch81 deleted the feature-spm-rebased branch December 2, 2018 09:32
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.

4 participants