From 5140b5a4fb6b96391d8e3af7ca9f32ed9fe8c451 Mon Sep 17 00:00:00 2001 From: Summer Stapleton Date: Mon, 8 Apr 2019 14:32:50 -0700 Subject: [PATCH] Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205) * Minor modifications for RC build * Small modification to version in the recipe/meta.yaml * Updating release stage in isis/version --- isis/version | 4 ++-- recipe/build.sh | 1 - recipe/meta.yaml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/isis/version b/isis/version index eec0015fa2..7f10080cf1 100644 --- a/isis/version +++ b/isis/version @@ -1,3 +1,3 @@ -3.6.1 # Public version number -2019-04-26 # Release date +3.7.0 # Public version number +2019-04-01 # Release date alpha # release stage (alpha, beta, stable) diff --git a/recipe/build.sh b/recipe/build.sh index ef8368ae31..af1097a7d0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,4 +2,3 @@ mkdir build cd build cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis ninja install -ninja docs diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c220d7649f..44a7f22a45 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,12 +12,12 @@ # A Public Release for ISIS3.6.1: {% set version = "3.6.1" %} # A Release Candidate for ISIS3.6.1: {% set version = "3.6.1_RC" %} # A custom build of ISIS3.6.1 for the CaSSIS mission: {% set version = "3.6.1_cassis" %} -{% set version = "3.6.1" %} +{% set version = "3.7.0_RC" %} # This is the branch that conda build will pull from the ISIS repository. If you are building for a # general public release, leave the branch as "release". If you are building a custom build, like # for a mission for example, simply change the value to the branch of choice. -{% set git_branch = "release" %} +{% set git_branch = "dev" %} # This is the build number for the current version you are building. If this is the first build of # this version, the build number will be 0. It is incremented by 1 with every consecutive build of