Skip to content

Commit

Permalink
Merge pull request #4935 from camptocamp/fix24
Browse files Browse the repository at this point in the history
Exclude the locale folder
  • Loading branch information
sbrunner authored May 16, 2019
2 parents b5a4e5e + d29aade commit 902c6d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions travis/test-upgrade-convert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ function v230 {
commons/testgeomapfish_commons.egg-info geoportal/testgeomapfish_geoportal.egg-info
cd -
find ${WORKSPACE}/v230-$1docker -type d -empty -delete
diff --recursive --exclude=.git ${WORKSPACE}/$1dockerref ${WORKSPACE}/v230-$1docker
diff --recursive --exclude=.git --exclude=locale ${WORKSPACE}/$1dockerref ${WORKSPACE}/v230-$1docker
}

if [ "$1" = "v230-docker" ]
Expand Down Expand Up @@ -340,7 +340,7 @@ function v240 {
commons/testgeomapfish_commons.egg-info geoportal/testgeomapfish_geoportal.egg-info
cd -
find ${WORKSPACE}/v240 -type d -empty -delete
diff --recursive --exclude=.git ${WORKSPACE}/$1dockerref ${WORKSPACE}/v240
diff --recursive --exclude=.git --exclude=locale ${WORKSPACE}/$1dockerref ${WORKSPACE}/v240
}

if [ "$1" = "v240" ]
Expand Down

0 comments on commit 902c6d8

Please sign in to comment.