Skip to content

Commit

Permalink
Mergeback/5.8.3 snapshot versioning from prod (#348)
Browse files Browse the repository at this point in the history
* add test branch deployability

* Score no such key issue #324 (#345)

* code fix for the NoSuchKey issue encountered when uploading large files.

* added custom branch name to test changes

* removed custom branch tag

---------

Co-authored-by: UmmulkiramR <urangwala@oicr.on.ca>

* release 5.8.2 - bug fix for issue #324

* merge-back versioning from prod

---------

Co-authored-by: Anders Richardsson <2107110+caravinci@users.noreply.github.com>
Co-authored-by: UmmulkiramR <urangwala@oicr.on.ca>
  • Loading branch information
3 people authored Mar 6, 2023
1 parent 1f4664f commit 006c818
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pipeline {
when {
anyOf {
branch 'develop'
branch 'main'
branch 'master'
branch 'test*'
}
}
Expand Down Expand Up @@ -188,7 +188,7 @@ pipeline {
sh "docker login ${gitHubRegistry} -u $USERNAME -p $PASSWORD"

script {
if (env.BRANCH_NAME ==~ 'main') { //push edge and commit tags
if (env.BRANCH_NAME ==~ 'master') { //push edge and commit tags
sh "docker tag server:${commit} ${gitHubRegistry}/${gitHubRepo}-server:${version}"
sh "docker push ${gitHubRegistry}/${gitHubRepo}-server:${version}"

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S

<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>${project.name}</description>
Expand Down
2 changes: 1 addition & 1 deletion score-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-fs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion score-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
<parent>
<groupId>bio.overture</groupId>
<artifactId>score</artifactId>
<version>5.8.1</version>
<version>5.8.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 006c818

Please sign in to comment.