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

Added Aljazeera to global list #510

Merged
merged 1 commit into from
Sep 27, 2019
Merged

Conversation

agrabeli
Copy link
Collaborator

Aljazeera appears to have 2 domains: aljazeera.net & aljazeera.com.

As part of this PR, I added aljazeera.com to the global test list and fixed the URL for aljazeera.net.

This was referenced Sep 19, 2019
@agrabeli
Copy link
Collaborator Author

@sneft Merging #511 is a prerequisite to merging this PR.

@agrabeli
Copy link
Collaborator Author

Hm, I'm wondering why the Travis CI build is still failing, given that the issues have been fixed with #511 which has been merged....

@agrabeli
Copy link
Collaborator Author

@hellais @sneft To delete duplicates (between the global test list and local ones), I opened another PR (#511) which has been merged. I would therefore assume that the checks for this PR should pass, but they don't. How can we make Travis re-process the PR once another PR - which addresses the failed checks - has been merged?

@sneft
Copy link
Collaborator

sneft commented Sep 24, 2019

I think the issue is that Travis processing only the files contained within your PR, which will technically still contain the duplicate URLs in the local lists since #511 was only merged afterwards. Since there are no conflicts with the base branch, I'm under the impression that if we were to merge this right now it would only add the URLs to the global list and wouldn't change the 3 local lists.

I think the alternative is for you to update your fork and submit another PR updating this one, which should reflect the changes made to the local lists?

@agrabeli
Copy link
Collaborator Author

Since there are no conflicts with the base branch, I'm under the impression that if we were to merge this right now it would only add the URLs to the global list and wouldn't change the 3 local lists.

@sneft Yes, I have the same impression. Should we try merging this PR?

@sneft sneft merged commit dce7166 into citizenlab:master Sep 27, 2019
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.

2 participants