Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Switch to using Github Actions CI (bp #1690) #1699

Merged
merged 3 commits into from
Dec 17, 2020
Merged

Switch to using Github Actions CI (bp #1690) #1699

merged 3 commits into from
Dec 17, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2020

This is an automated backport of pull request #1690 done by Mergify

Cherry-pick of 25a417f has failed:

On branch mergify/bp/3.3.x/pr-1690
Your branch is up to date with 'origin/3.3.x'.

You are currently cherry-picking commit 25a417f8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   .github/workflows/test.yml

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

	both modified:   .mergify.yml
	both modified:   build.sbt
	both modified:   project/plugins.sbt

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

@jackkoenig
Switch to using Github Actions CI (#1690)
dfcd364 
MiMa binary compatibility checks are now run on master, but the
mimaPreviousArtifacts are empty which makes the check a no-op. This
helps keep both the build.sbt and CI more consistent between master and
stable branches.

.mergify.yml is also updated with mergify.sc from chisel-repo-tools
using the following configuration:

conditions:
  - status-success=all tests passed
branches:
  - 3.2.x
  - 3.3.x
  - 3.4.x
(cherry picked from commit 25a417f)

# Conflicts:
#	.mergify.yml
#	build.sbt
#	project/plugins.sbt
@mergify mergify bot added the conflicts label Dec 16, 2020
@mergify mergify bot mentioned this pull request Dec 16, 2020
Merged
11 tasks
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Dec 16, 2020
@jackkoenig
Remove mdoc check from GithubActions
6307f7c 
This test was added in 3.4
@jackkoenig
Copy link
Contributor

Red X is due to GitHub App like Mergify are not allowed to merge pull request where .github/workflows is changed. Merging manually.

@jackkoenig jackkoenig merged commit 719b901 into 3.3.x Dec 17, 2020
@jackkoenig jackkoenig deleted the mergify/bp/3.3.x/pr-1690 branch December 17, 2020 01:06
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jackkoenig