Bypass ADC check

kdbinder · May 20, 2020 · 8b6c049 · 8b6c049
1 parent 1809a04
commit 8b6c049
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '20.05'
 # The full version, including alpha/beta/rc tags.
-release = '20.05.0-SNAPSHOT'
+release = '20.05.2-SNAPSHOT'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/modules/nextflow/src/main/groovy/nextflow/Const.groovy b/modules/nextflow/src/main/groovy/nextflow/Const.groovy
@@ -57,12 +57,12 @@ class Const {
     /**
      * The app build time as linux/unix timestamp
      */
-    static public final long APP_TIMESTAMP = 1589215298205
+    static public final long APP_TIMESTAMP = 1590004276933
 
     /**
      * The app build number
      */
-    static public final int APP_BUILDNUM = 5352
+    static public final int APP_BUILDNUM = 5355
 
 
     /**

diff --git a/...s/nf-google/src/main/nextflow/cloud/google/lifesciences/GoogleLifeSciencesExecutor.groovy b/...s/nf-google/src/main/nextflow/cloud/google/lifesciences/GoogleLifeSciencesExecutor.groovy
@@ -70,14 +70,14 @@ class GoogleLifeSciencesExecutor extends Executor {
             throw new AbortOperationException("Executor `google-lifesciences` requires a Google Storage bucket to be specified as a working directory -- Add the option `-w gs://<your-bucket/path>` to your run command line or specify a workDir in your config file")
         }
 
-        def credsFile = env.get('GOOGLE_APPLICATION_CREDENTIALS')
-        final projectId = GoogleLifeSciencesConfig.getProjectIdFromCreds(credsFile)
+//        def credsFile = env.get('GOOGLE_APPLICATION_CREDENTIALS')
+//        final projectId = GoogleLifeSciencesConfig.getProjectIdFromCreds(credsFile)
 
         config = GoogleLifeSciencesConfig.fromSession(session)
-        if( !config.project )
-            config.project = projectId
-        else if( config.project != projectId )
-            throw new AbortOperationException("Project Id `$config.project` declared in the nextflow config file does not match the one expected by credentials file: $credsFile")
+//        if( !config.project )
+//            config.project = projectId
+ //       else if( config.project != projectId )
+ //           throw new AbortOperationException("Project Id `$config.project` declared in the nextflow config file does not match the one expected by credentials file: $credsFile")
 
         if( session.binDir && !config.disableBinDir ) {
             final cloudPath = getTempDir()

diff --git a/nextflow b/nextflow
@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 [[ "$NXF_DEBUG" == 'x' ]] && set -x
-NXF_VER=${NXF_VER:-'20.05.0-SNAPSHOT'}
+NXF_VER=${NXF_VER:-'20.05.2-SNAPSHOT'}
 NXF_ORG=${NXF_ORG:-'nextflow-io'}
 NXF_HOME=${NXF_HOME:-$HOME/.nextflow}
 NXF_PROT=${NXF_PROT:-'https'}