Ignore:
Timestamp:
08/06/18 14:38:28 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: reverting back to previous solution due to svn trust issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/jenkins/jenkins.sh

    r23058 r23059  
    5555
    5656        #Get changes from jenkins itself (svn requires credentials)
    57         svn --non-interactive --no-auth-cache --trust-server-cert diff -r $SVN_PREVIOUS:$SVN_CURRENT --summarize $ISSM_DIR | awk '{print $NF}' > $ISSM_DIR/changes
     57        #svn --non-interactive --no-auth-cache --trust-server-cert diff -r $SVN_PREVIOUS:$SVN_CURRENT --summarize $ISSM_DIR | awk '{print $NF}' > $ISSM_DIR/TEMP
     58        rm -rf changes
     59        wget $SERVER/job/$JOB_NAME/$BUILD_NUMBER/changes > /dev/null 2>&1
     60
     61        #Process html page and get the list of files that has changed (tricky...)
     62        #cat changes | grep '="The file was modified"' | sed -e 's/.*<\/td><td><a>\(.*\)<\/a><\/td><td>.*/\1/' > $ISSM_DIR/TEMP
     63        #cat changes | grep 'document_edit' |sed -e 's/document_edit.png/document_edit.png\
     64                #/g' | sed -e 's/.*<\/a><\/td><td>\(.*\)<\/td><\/tr>.*/\1/' | grep -v 'document_edit.png' > $ISSM_DIR/TEMP
     65        cat changes  | tr " " "\n" | grep trunk |  sed -e 's/.*<a>\(.*\)<\/a>.*/\1/' > $ISSM_DIR/TEMP
    5866
    5967        #Print list of files
    6068        echo "   "
    6169        echo "List of updated files"
    62         cat $ISSM_DIR/changes
     70        cat $ISSM_DIR/TEMP
    6371        echo "   "
    6472
    6573        #Do we need to reinstall externalpackages?
    6674        echo "Determining installation type"
    67         if [ ! -z "$(cat $ISSM_DIR/changes | grep externalpackages)" ] ; then
     75        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep externalpackages)" ] ; then
    6876                echo "  -- checking for changed externalpackages... yes";
    6977                ISSM_EXTERNALPACKAGES="yes"
     
    7482
    7583        #Do we need to reconfigure
    76         if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "Makefile.am" -e "m4" )" ] ||
     84        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "Makefile.am" -e "m4" )" ] ||
    7785                [ ! -f "$ISSM_DIR/bin/issm.exe" ] ||
    7886                [ "$ISSM_EXTERNALPACKAGES" == "yes" ] ;
     
    8694
    8795        #Do we need to recompile
    88         if [ ! -z "$(cat $ISSM_DIR/changes | grep -e "\.cpp" -e "\.h" )" ] ||
     96        if [ ! -z "$(cat $ISSM_DIR/TEMP | grep -e "\.cpp" -e "\.h" )" ] ||
    8997                [ "$ISSM_RECONFIGURE" == "yes" ] ;
    9098        then
Note: See TracChangeset for help on using the changeset viewer.