Changeset 8ca1ba1 in sasview


Ignore:
Timestamp:
Jun 30, 2016 7:04:31 AM (8 years ago)
Author:
trnielsen
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
1a4f4df
Parents:
90d141a
Message:

Ticket #419: OSX Linux - Move GIT revision nr to build script

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • build_tools/jenkins_linux_build.sh

    rbf3ca1e r8ca1ba1  
    1010 
    1111cd $WORKSPACE 
     12 
     13 
     14# SET SASVIEW GITHASH 
     15cd $WORKSPACE 
     16cd sasview/sasview 
     17githash=$( git rev-parse HEAD ) 
     18sed -i.bak s/GIT_COMMIT/$githash/g __init__.py 
     19 
    1220 
    1321# SASMODLES 

  • build_tools/jenkins_osx_build.sh

    r91afd87 r8ca1ba1  
    1414 
    1515cd $WORKSPACE 
     16 
     17# SET SASVIEW GITHASH 
     18cd $WORKSPACE 
     19cd sasview/sasview 
     20githash=$( git rev-parse HEAD ) 
     21sed -i.bak s/GIT_COMMIT/$githash/g __init__.py 
     22 
    1623 
    1724# SASMODLES 

  • sasview/__init__.py

    rfa4ea80 r8ca1ba1  
    11__version__ = "4.0.0-alpha" 
    2 __build__ = "1" 
     2__build__ = "GIT_COMMIT" 
     3try: 
     4    import subprocess 
     5    git_revision = subprocess.check_output(['git', 'rev-parse', 'HEAD']) 
     6    __build__ = str(git_revision).strip() 
     7except: 
     8    import logging 
     9    import sys 
     10    logging.warning("Error while determining build number\n  %s" % sys.exc_value) 
Note: See TracChangeset for help on using the changeset viewer.