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

Update civicrm.module links #629

Merged

Conversation

eileenmcnaughton
Copy link
Contributor

@seamuslee001 replaces #627

@MikeyMJCO probably has a better suggestion.....

Update civicrm.module

Co-authored-by: Mikey O'Toole <mikey@mjco.uk>

Update civicrm.module

Co-authored-by: Mikey O'Toole <mikey@mjco.uk>
@civibot
Copy link

civibot bot commented Nov 18, 2020

(Standard links)

@eileenmcnaughton
Copy link
Contributor Author

test this please

1 similar comment
@eileenmcnaughton
Copy link
Contributor Author

test this please

@totten
Copy link
Member

totten commented Nov 20, 2020

The test suite is failing on this guard

case "$ghprbTargetBranch" in
  7.x-4.6*|7.x-4.7*|7.x-5*|7.x-master*)
    CIVIVER=$(echo "$ghprbTargetBranch" | sed 's;^7.x-;;')
    ;;
  *)
    ## This actually true for many branches, so we exit softly...
    echo "PR test not allowed for $ghprbTargetBranch"
    exit 0
    ;;
esac

The target branch looks off:

Screen Shot 2020-11-19 at 9 49 16 PM

Shouldn't the branch be civicrm:7.x-master?

@eileenmcnaughton eileenmcnaughton changed the base branch from eileenmcnaughton-patch-1 to 7.x-master November 20, 2020 06:06
@eileenmcnaughton
Copy link
Contributor Author

Yep - that was it

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 @totten just realised this still isn't merged

@seamuslee001 seamuslee001 changed the base branch from 7.x-master to 7.x-5.33 December 3, 2020 20:22
@civibot civibot bot added 7.x-5.33 and removed 7.x-master labels Dec 3, 2020
@seamuslee001 seamuslee001 merged commit b417687 into civicrm:7.x-5.33 Dec 3, 2020
@eileenmcnaughton eileenmcnaughton deleted the eileenmcnaughton-patch-1 branch December 3, 2020 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants