From 539a22b68c114c94eaf4a88ea8d26b7bfe2d0c39 Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Sun, 1 Nov 2020 16:22:18 +0100 Subject: [PATCH] [release 20.10.0] Update timestamp and build numbers --- .github/workflows/build.yml | 5 ++--- VERSION | 2 +- docs/conf.py | 4 ++-- modules/nextflow/src/main/groovy/nextflow/Const.groovy | 6 +++--- nextflow | 2 +- nextflow.md5 | 2 +- nextflow.sha1 | 2 +- nextflow.sha256 | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8378d3e1e1..97277c35a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,6 @@ jobs: NXF_GITLAB_ACCESS_TOKEN: ${{ secrets.NXF_GITLAB_ACCESS_TOKEN }} - name: Integration - if: "matrix.java_version > 8 && (github.ref == 'master' || github.ref == 'testing')" run: make install && ./integration-tests.sh env: TEST_JDK: ${{ matrix.java_version }} @@ -68,14 +67,14 @@ jobs: GOOGLE_SECRET: ${{ secrets.GOOGLE_SECRET }} - name: Setup Java 8 - if: "matrix.java_version != 8 && (github.ref == 'master' || github.ref == 'testing')" + if: "matrix.java_version != 8 && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/testing')" uses: actions/setup-java@v1 with: java-version: 8 architecture: x64 - name: Integration vs Java 8 - if: "matrix.java_version != 8 && (github.ref == 'master' || github.ref == 'testing')" + if: "matrix.java_version != 8 && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/testing')" run: ./integration-tests.sh env: TEST_JDK: 8 diff --git a/VERSION b/VERSION index bb01c9d876..9486825360 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -20.09.1-edge \ No newline at end of file +20.10.0 \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 9110ee654c..3c2ad93e5e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '20.09' +version = '20.10' # The full version, including alpha/beta/rc tags. -release = '20.09.1-edge' +release = '20.10.0' # 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 index b39d778cbf..b322b87fcc 100644 --- a/modules/nextflow/src/main/groovy/nextflow/Const.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/Const.groovy @@ -53,17 +53,17 @@ class Const { /** * The application version */ - static public final String APP_VER = "20.09.1-edge" + static public final String APP_VER = "20.10.0" /** * The app build time as linux/unix timestamp */ - static public final long APP_TIMESTAMP = 1602753646780 + static public final long APP_TIMESTAMP = 1604244520074 /** * The app build number */ - static public final int APP_BUILDNUM = 5428 + static public final int APP_BUILDNUM = 5431 /** diff --git a/nextflow b/nextflow index 7a840de114..44392ce818 100755 --- a/nextflow +++ b/nextflow @@ -16,7 +16,7 @@ # limitations under the License. [[ "$NXF_DEBUG" == 'x' ]] && set -x -NXF_VER=${NXF_VER:-'20.09.1-edge'} +NXF_VER=${NXF_VER:-'20.10.0'} NXF_ORG=${NXF_ORG:-'nextflow-io'} NXF_HOME=${NXF_HOME:-$HOME/.nextflow} NXF_PROT=${NXF_PROT:-'https'} diff --git a/nextflow.md5 b/nextflow.md5 index 6826f18008..7b9c938a8b 100644 --- a/nextflow.md5 +++ b/nextflow.md5 @@ -1 +1 @@ -e89d9ae171cbebb166aad3f86c81d26a +53170323f8a3b42afe77916cbed2eaa4 diff --git a/nextflow.sha1 b/nextflow.sha1 index 8ba97e837c..4a40b49734 100644 --- a/nextflow.sha1 +++ b/nextflow.sha1 @@ -1 +1 @@ -12b95ea627dbe3d21b8204b6213c47df18394f37 +4966dd1130017cb76ee30a960995f17d2e452d97 diff --git a/nextflow.sha256 b/nextflow.sha256 index 6f4c61d442..40b1888d31 100644 --- a/nextflow.sha256 +++ b/nextflow.sha256 @@ -1 +1 @@ -f9d5ab5f108de0ac25141e5914a7b5ea316d6e6afcf34f230975a1c7a262d9bd +54f76c83cbabe8ec68d6a878dcf921e647284499f4ae917356e594d873cb78dd