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.

Sign up for GitHub

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

Jump to bottom

fix: #636 fix Jenkins won't trigger a build of merge commit on merged… #1099

Merged
32 commits merged into from
Mar 30, 2021
Merged

fix: #636 fix Jenkins won't trigger a build of merge commit on merged… #1099

32 commits merged into from
Mar 30, 2021

Conversation

yili1992
Copy link

@yili1992 yili1992 commented Jan 28, 2021 •
edited
Loading

This commit fixes issue #636, #1023

markjacksonfishing
markjacksonfishing suggested changes Jan 28, 2021
View reviewed changes
Copy link
Contributor

@markjacksonfishing markjacksonfishing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto build failure in ci failed.

@zbynek
Copy link

zbynek commented Feb 2, 2021

Actually all the PR builds for the plugin are failing because the POM in master is invalid. Maybe better to fix that in another PR #1102

bulanovk and others added 24 commits February 12, 2021 11:09
@bulanovk
Fix dependencies and mock to make unit test Success
4eb27b4 
Changes were made:
1. Fix pom.xml to make pom.xml valid
2. Downgrade guava to 20.0 to avoid method not found
3. Add mock in GitLabCommitStatusPublisherTest to avoid NPE
4. Bump jenkins-test-harness
5. Add timeout to avoid Temp Directory dispose error
6. Bump Jackson to Modern version with ordering bugfix 2.12.1
7. Update parent.pom to 4.16
8. Switch version management to DependenciesManagement using Jenkins BOM
9. Align all depends according to bom version 23
10. Minimal required version of Jenkins 2.224.4
@bulanovk @MarkEWaite
Make github plugin documentation avaliable on plugins.jenkins,io
03e3bae 
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
@bulanovk
Switch to bom-2.222.x version 23 and remove direct plugins downgrade
4c64148
@omehegan
Merge pull request jenkinsci#1103 from bulanovk/bugfix/mock
958eadb 
Fix dependencies and mock to make unit test Success
@omehegan
Fix javadoc failures
e71a920
@MarkEWaite
Remove git submodule config pipeline settings
7236e57 
The values are the defaults in all plugin releases.

Values are not needed and are no longer shown to users
with git plugin 4.6.0 and later.
@ironcerocloudbees
[JENKINS-64341] Remove the table, tr and td tags from the forms that …
4b8917c 
…should not be tables
@omehegan
[maven-release-plugin] prepare release gitlab-plugin-1.5.18
f6d714a
@omehegan
[maven-release-plugin] prepare for next development iteration
debf820
@omehegan
Fix broken javadoc
110f84e
@Nockiro
Updated groovy job script in README
a14f587 
The updated script uses the variables made available/proposed by EnvInject now.
Add possibility to delete the branch after merge success
12d5c3d
@omehegan
[maven-release-plugin] prepare release gitlab-plugin-1.5.19
15b7970
@omehegan
[maven-release-plugin] prepare for next development iteration
0925489
@omehegan
Update about need for maintainers.
23117fa
@jre-lsft
Fix logic error blocking Multibranch Pipeline projects from being tri…
6f783c3 
…ggered

The bug was introduced in commit 4eb27b4.
It prevented Multibranch Pipeline projects from being triggered by webhooks
*unless* 'Ignore on push notifications' had been set on the Git (branch)
source.

Fixes jenkinsci#1116
Merge pull request jenkinsci#1111 from MaximeMazet/master
76afae8 
Add possibility to delete the branch after merge success
@reinholdfuereder
Update CHANGELOG a little bit
dddb6cb 
Still missing a lot
Merge pull request jenkinsci#1109 from ironcerocloudbees/JENKINS-64341
3312795 
[JENKINS-64341] Remove the table, tr and td tags from the forms that should not be tables
Merge pull request jenkinsci#1120 from reinholdfuereder/patch-1
749e90a 
Update CHANGELOG a little bit
Merge pull request jenkinsci#1118 from jre-lsft/fix-logic-error
9034e01 
Fix logic error blocking Multibranch Pipeline projects from being triggered
Merge pull request jenkinsci#1110 from Nockiro/patch-1
601358f 
Update README with a corrected groovy job script
@bulanovk
Introduce 2 unit test to cover scenario of starting multibranch build…
fe7bc5e 
… condition based in SCMTrait. Cover bug reported by issue jenkinsci#1116

Add sleep 5s to @after and increase test timeout to MergeRequestHookTriggerHandlerImplTest to avoid random test failure for Windows CI
Merge pull request jenkinsci#1121 from bulanovk/feature/multibranchTest
1e3f00b 
Introduce 2 unit test to cover scenario of starting multibranch build…
Merge pull request jenkinsci#1107 from MarkEWaite/patch-1
8387844 
Remove git submodule config pipeline settings
@pyssling
Copy link

@yili1992 could you try rebasing this?

@yili1992
Copy link
Author

yili1992 commented Mar 23, 2021 •
edited
Loading

@yili1992 could you try rebasing this?

thanks, I found the POM has been fixed , I will rebase

@yili1992 yili1992 closed this Mar 23, 2021
@yili1992 yili1992 reopened this Mar 23, 2021
@yili1992
Copy link
Author

yili1992 commented Mar 23, 2021 •
edited
Loading

Auto build failure in ci failed.

@markyjackson-taulia Hi markyjackson-taulia , at present, ci successed , please review, thanks

@ghost ghost merged commit 88fa742 into jenkinsci:master Mar 30, 2021
@dskrvk
Copy link

dskrvk commented Jul 5, 2021 •
edited
Loading

Looks like this was made it into version 1.5.21, but that still doesn't seem to have been published to the Jenkins plugins directory: https://plugins.jenkins.io/gitlab-plugin/#releases

@basil basil added the bug For changelog: Minor bug. Will be listed after features label Oct 12, 2021
@basil
Copy link
Member

basil commented Oct 13, 2021

@dskrvk @pyssling @yili1992 The changes in this PR will be released in the forthcoming 1.5.22 release. Incremental build 1.5.22-rc1276.9f26cf564af5 is available for testing. Please test the incremental build and report any regressions from 1.5.20.

The incremental build .hpi file can be downloaded from here: https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/gitlab-plugin/1.5.22-rc1276.9f26cf564af5/

For instructions on how to install a custom build, see: https://www.jenkins.io/doc/book/managing/plugins/#advanced-installation

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markjacksonfishing markjacksonfishing markjacksonfishing requested changes

Assignees
No one assigned
Labels
bug For changelog: Minor bug. Will be listed after features
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.