Skip to content

Conversation

LDong-Arm
Copy link
Contributor

Summary of changes

When the scripts for the old tools are modified (e.g. when a new target is added), the frozen tools check fails but we allow the change if it's really needed. By moving the frozen tools check to the end, Travis doesn't terminate early and the other tests get to run.

Impact of changes

Migration actions required

Documentation

None.


Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers

@ARMmbed/mbed-os-maintainers


@LDong-Arm
Copy link
Contributor Author

@Patater @ARMmbed/mbed-os-maintainers It'd be good to get this in, so we can let Travis run in full in #14441

@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label May 17, 2021
@ciarmcom ciarmcom requested a review from a team May 17, 2021 11:30
@ciarmcom
Copy link
Member

@LDong-Arm, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

0xc0170
0xc0170 previously approved these changes May 17, 2021
Patater
Patater previously approved these changes May 17, 2021
@0xc0170
Copy link
Contributor

0xc0170 commented May 18, 2021

CI started

@mergify
Copy link

mergify bot commented May 24, 2021

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@adbridge
Copy link
Contributor

@LDong-Arm looks like you have a conflict which needs resolving

When the scripts for the old tools are modified (e.g. when a new
target is added), the frozen tools check fails but we allow the change
if it's really needed. By moving the frozen tools check to the end,
Travis doesn't terminate early and the other tests get to run.
@mergify mergify bot dismissed stale reviews from 0xc0170 and Patater May 24, 2021 13:40

Pull request has been modified.

@LDong-Arm
Copy link
Contributor Author

LDong-Arm commented May 24, 2021

@LDong-Arm looks like you have a conflict which needs resolving

Rebased now. Waiting for Travis to complete, then we can start CI re-approval is needed.

@LDong-Arm LDong-Arm requested a review from Patater May 25, 2021 09:09
@mergify mergify bot added needs: CI and removed needs: work labels May 25, 2021
@Patater
Copy link
Contributor

Patater commented May 25, 2021

CI started

@adbridge adbridge merged commit e5c79ed into ARMmbed:master May 25, 2021
@mergify mergify bot removed the ready for merge label May 25, 2021
@mbedmain mbedmain added release-version: 6.12.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jun 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants