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 teensy patch and compiler (backport #1482) #1484

Merged
merged 2 commits into from
Jul 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 27, 2023

This is an automatic backport of pull request #1482 done by Mergify.
Cherry-pick of 69ca6d8 has failed:

On branch mergify/bp/rolling/pr-1482
Your branch is up to date with 'origin/rolling'.

You are currently cherry-picking commit 69ca6d8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/ci.yml
	modified:   extras/library_generation/library_generation.sh
	modified:   extras/patching_boards/platform_teensy.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Update teensy compiler and platform fix

Signed-off-by: acuadros95 <acuadros1995@gmail.com>

* Update Readme and CI

Signed-off-by: acuadros95 <acuadros1995@gmail.com>

* set specific version to teensy CI

Signed-off-by: acuadros95 <acuadros1995@gmail.com>

---------

Signed-off-by: acuadros95 <acuadros1995@gmail.com>
(cherry picked from commit 69ca6d8)

# Conflicts:
#	README.md
@mergify mergify bot added the conflicts label Jul 27, 2023
@mergify mergify bot mentioned this pull request Jul 27, 2023
Signed-off-by: acuadros95 <acuadros1995@gmail.com>
@Acuadros95 Acuadros95 merged commit 704a979 into rolling Jul 27, 2023
1 of 2 checks passed
@Acuadros95 Acuadros95 deleted the mergify/bp/rolling/pr-1482 branch July 27, 2023 09:05
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.

1 participant