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

Rollup: Rerun multiple PRs through CI that have already indirectly passed #8367

Closed
wants to merge 17 commits into from

Conversation

cmonr
Copy link
Contributor

@cmonr cmonr commented Oct 10, 2018

Description

This concludes rollup/bundle PR testing for now.

Both previous rollup/bundle tests (#8356 and #8357) have completely passed CI, but due to early verification, the flow used to generate those PRs was undeveloped, which wouldn't yield the results we're looking for.

In addition, this rollup PR was generated using a simple bash script. The only manual intervention needed was the push of the new branch, and creation of the PR.

Included PRs:

How it works

Normally, we run CI against every single PR before merging it into the master branch. Once a PR passes and is merged, it's verified that it has a proper release label, so that the patch creation process can pull in the correct changes.

What rolling-up/bundling does is that instead of testing a single PR against CI, select PRs are merged into a temporary branch (rollup in this case), and a new PR is created to put this new branch against CI. Once it passes, the rollup PR is merged, and all rolled up PRs are automatically marked as merged and closed.

The rollup PR does not need nor should not get a release version label. Instead, the same process exists, where the individial PR should have a release version label.

For an example of what this looks like after the merge process, please refer to the following fork links:

Restrictions

For now, it is suggested that only PRs that are marked as needs; CI and with the same release-version: labels be bundled. Other combinations are possible, but this should limit the scope of any debugging efforts that might be needed.

Because of the numerous types of errors that could occur with a single PR, it is also suggested that the PRs be 1) tiny, and 2) orthogonal to each other. This way, if/when a test fails, determining where the problem within a set of PRs isn't the worst excercise in the world.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Breaking change

theotherjimmy and others added 17 commits September 25, 2018 12:31
### Description

The VTOR reserves the lowest 7 bits. This PR changes the round up
behavoir of the application offset to make sure that the address used
for the in-flash vector table always ends in 7 0's.

Fixes #7392

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Breaking change
### Description

The netbeans exporter was being inconsistant with it's invocation of
the C pre-processor on the linker script: the C pre-processor was always
invoked from `$PATH` where as the rest of the tools were invoked as
configured by the tools. This changes the invocation of CPP to match the
rest of the tools: heed the conifguration.

Fixes ARMmbed/mbed-cli#663

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Breaking change
…2le/mbed-os into yossi2le-fix_warnings_in_blockdevices
…mbed into theotherjimmy-nb-consistant-paths
@cmonr cmonr requested review from a team October 10, 2018 21:59
@cmonr
Copy link
Contributor Author

cmonr commented Oct 10, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Oct 10, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented Oct 11, 2018

@mbed-ci
Copy link

mbed-ci commented Oct 11, 2018

@cmonr
Copy link
Contributor Author

cmonr commented Oct 11, 2018

Fyi, this is now only waiting on the "continuous-integration/jenkins/branch" test, which appears to now be disabled in CI.

I might recreate this PR using a forked branch instead of an ARMmbed branch.

@cmonr
Copy link
Contributor Author

cmonr commented Oct 12, 2018

Closing since #8387 came in!

@cmonr cmonr closed this Oct 12, 2018
@cmonr cmonr removed the needs: CI label Oct 12, 2018
@0xc0170 0xc0170 deleted the rollup branch October 22, 2018 13:50
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.

None yet

5 participants