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

Issue 1312 tag repos #1321

Merged
merged 2 commits into from May 21, 2015

Conversation

Projects
None yet
4 participants
@doutriaux1
Member

doutriaux1 commented May 13, 2015

@aashish24 @dlonie @chaosphere2112 please review

doutriaux1 added some commits May 11, 2015

updated tag points for repo used by uvcdat
added capability to checkout a specific branch for testdata repo
fix #1312
@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 14, 2015

@doutriaux1 we would have -s ours when we bring this change to master.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 14, 2015

Cloning into 'VTK'...
error: pathspec 'uvcdat-2.2.0' did not match any file(s) known to git.
CMake Error at /home/buildbot/buildbot/uvcdat-garant-linux-release/build/VTK-prefix/tmp/VTK-gitclone.cmake:28 (message):
Failed to checkout tag: 'uvcdat-2.2.0'

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

you merged it in before I applied the tag I think, can you try again, the tag should be on VTK since last night

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 14, 2015

I didn't. The error is from buildbot machines. When you pushed a branch buildbot slaves ran the build.

@jbeezley

This comment has been minimized.

Contributor

jbeezley commented May 14, 2015

I reset the builds. Buildbot will start a build every time you push a change even if there isn't a PR for it yet.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

I see. Well we're good now, the tags are in place. Can we restart the test?

@jbeezley

This comment has been minimized.

Contributor

jbeezley commented May 14, 2015

I already did. Here is one of the results.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

oh god... Looks like the tag point for VTK is wrong, let me double check, I might have tagged master rather than uvcdat-master.... Doh!

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

@jbeezley how to do you restart the buildbot? I moved the tag point.

@jbeezley

This comment has been minimized.

Contributor

jbeezley commented May 14, 2015

You have to be connected to our local network for the moment. I think we are working on exposing the buildbot interface, but for now just ping me.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 14, 2015

yup, I am talking to the sys admins here to see if we can expose it to LLNL or allow @doutriaux1 to login to that machine somehow.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

@jbeezley or @aashish24 can you restart it then for this time, the tag on VTK is correct now.

@jbeezley

This comment has been minimized.

Contributor

jbeezley commented May 14, 2015

I did, they are in the queue. Patience, «petit scarabée».

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 14, 2015

I loved that show! And I definitely need to learn the mysterious ways of the path to patience....

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 18, 2015

For some reason garant has lot more tests failing. @jbeezley do you know why?

@jbeezley

This comment has been minimized.

Contributor

jbeezley commented May 18, 2015

Looks like the baselines were updated. It isn't just this branch, the current master is failing as well.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 20, 2015

@doutriaux1 we still need to merge this branch right?

@durack1

This comment has been minimized.

Member

durack1 commented May 20, 2015

@doutriaux1 @aashish24 it seems 2.2.0rc1 is what has been issued the DOI at zenodo and not 2.2.0..

It might be good to get the additional tweaks into master and then move the 2.2.0 tag point?

@durack1

This comment has been minimized.

Member

durack1 commented May 20, 2015

@doutriaux1 @aashish24 it seems that the correct 2.2.0 zenodo DOI is 10.5281/zenodo.17633 - I'll update in PR #1334 (updated)

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 21, 2015

can't believe i didn't notice @aashish24 did merge this one in master not release before tagging.... Well merging now...

doutriaux1 added a commit that referenced this pull request May 21, 2015

@doutriaux1 doutriaux1 merged commit 45488cb into release May 21, 2015

2 of 4 checks passed

continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
continuous-integration/kitware-buildbot/uvcdat-test-laptop-linux-release/ Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 22, 2015

@doutriaux1 I didn't merge this one. In face this branch should go last in release.

@aashish24

This comment has been minimized.

Contributor

aashish24 commented May 22, 2015

338ff31 Merge pull request #1328 from UV-CDAT/issue1212_durack1_Spyder2
5590d67 Merge pull request #1334 from UV-CDAT/issue1312_durack1_ReadmeU
b9508a5 Merge pull request #1322 from UV-CDAT/sync_release
10cf953 Merge branch 'newdiagtesCharles'
68abd0d Merge remote-tracking branch 'origin/release' into sync_release
87b49e2 Merge pull request #1253 from UV-CDAT/pyopenssl-0.14
3ab2222 Merge pull request #1303 from UV-CDAT/add_pep8_master
91e9f3b Merge pull request #1318 from UV-CDAT/issue_1308_isofill_unprop
f0ea001 Merge pull request #1320 from UV-CDAT/issue_1319_match_osx_toSD
b70346c Merge pull request #1291 from UV-CDAT/issue_1274_import_missing
3f99c8e Merge pull request #1316 from UV-CDAT/buildbot-passing
66bab1b Merge pull request #1307 from UV-CDAT/fix_vcs3d_test_image_orde
b14e373 Merge pull request #1296 from UV-CDAT/sync_master
d28dc1d Merge pull request #1298 from UV-CDAT/fix-libcf-build
8a9b545 Merge pull request #1267 from UV-CDAT/issue_903_turn_off_paravi
538cf4b Merge pull request #1229 from dlonie/vtk-refactor
94f63d6 Merge pull request #1287 from UV-CDAT/vcs3D_fix_dv3d_list
5d7882e Merge pull request #1273 from chaosphere2112/toolbar_layout_fix
3850d33 Merge pull request #1242 from chaosphere2112/text_resizing_wind
3650d29 Merged master

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented May 26, 2015

yes but you merged in into master where it didn't really need to go. Then I thought you merged it in release and TAGGED release assuming it was in....

@durack1

This comment has been minimized.

Member

durack1 commented May 26, 2015

@aashish24 pedantic point, but your info contained in the README.md for https://github.com/UV-CDAT/uvcdat/tree/2.2.0 is out of sync with the tag..

@remram44 remram44 deleted the issue_1312_tag_repos branch Jun 3, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment