Compare commits

...

6 Commits
9.3.2 ... 9.2.3

Author SHA1 Message Date
David
7fbb8ff076 Merge pull request #464 from david-r-bell/v9.2.3
V9.2.3
2021-07-22 13:50:03 +01:00
David Bell
cc956b29f4 Merge branch 'ibm-messaging-master' into v9.2.3 2021-07-22 12:18:26 +01:00
David Bell
786e26bccc fix merge conflict 2021-07-22 12:16:39 +01:00
David Bell
b074eed754 [ci skip]: Setting up v9.2.3 branch 2021-07-12 15:40:16 +01:00
LPowlett
4580cecf49 Updated README copyright date 2021-03-24 13:59:10 +00:00
Amrit Kandola
684106452b [ci skip]: Setting up v9.2.2 branch 2021-03-17 13:48:20 +00:00
2 changed files with 12 additions and 12 deletions

View File

@@ -25,7 +25,7 @@ services:
env:
global:
- MAIN_BRANCH=private-master
- MAIN_BRANCH=v9.2.3
- MQ_LTS_VERSION=9.2.0.1
- TAGCACHE_FILE=tagcache
- RELEASE=r1
@@ -40,7 +40,7 @@ go_import_path: "github.com/ibm-messaging/mq-container"
jobs:
include:
- stage: basic-build
if: branch != private-master AND tag IS blank
if: branch != v9.2.3 AND tag IS blank
name: "Basic AMD64 build"
os: linux
env:
@@ -50,12 +50,12 @@ jobs:
# CD Build
- stage: global-tag
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
name: "Generate Global Tag"
os: linux
script: bash -e travis-build-scripts/global-tag.sh
- stage: build
if: branch = private-master OR tag =~ ^release-candidate*
if: branch = v9.2.3 OR tag =~ ^release-candidate*
name: "Multi-Arch AMD64 build"
os: linux
env:
@@ -63,7 +63,7 @@ jobs:
- MQ_ARCHIVE_REPOSITORY=$MQ_923_ARCHIVE_REPOSITORY_AMD64
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_AMD64
script: bash -e travis-build-scripts/run.sh
# - if: branch = private-master OR tag =~ ^release-candidate*
# - if: branch = v9.2.3 OR tag =~ ^release-candidate*
# name: "Multi-Arch PPC64LE build"
# os: linux-ppc64le
# env:
@@ -73,7 +73,7 @@ jobs:
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_PPC64LE
# script: bash -e travis-build-scripts/run.sh
- stage: build
if: branch = private-master OR tag =~ ^release-candidate*
if: branch = v9.2.3 OR tag =~ ^release-candidate*
name: "Multi-Arch S390X build"
os: linux-s390
env:
@@ -83,7 +83,7 @@ jobs:
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_923_ARCHIVE_REPOSITORY_DEV_S390X
script: bash -e travis-build-scripts/run.sh
- stage: push-manifest
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
name: "Push Manifest-list to registry"
env:
- PUSH_MANIFEST_ONLY=true
@@ -92,7 +92,7 @@ jobs:
# LTS Build
- stage: global-tag
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
name: "Generate Global Tag"
os: linux
env:
@@ -102,7 +102,7 @@ jobs:
- RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/global-tag.sh
- stage: build
if: branch = private-master OR tag =~ ^release-candidate*
if: branch = v9.2.3 OR tag =~ ^release-candidate*
name: "Multi-Arch AMD64 build"
os: linux
env:
@@ -113,7 +113,7 @@ jobs:
- RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/run.sh
- stage: build
if: branch = private-master OR tag =~ ^release-candidate*
if: branch = v9.2.3 OR tag =~ ^release-candidate*
name: "Multi-Arch S390X build"
os: linux-s390
env:
@@ -125,7 +125,7 @@ jobs:
- RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/run.sh
- stage: push-manifest
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
if: branch = v9.2.3 AND type != pull_request OR tag =~ ^release-candidate*
name: "Push Manifest-list to registry"
env:
- LTS=true

View File

@@ -52,4 +52,4 @@ Note: The IBM MQ Advanced for Developers license does not permit further distrib
## Copyright
© Copyright IBM Corporation 2015, 2020
© Copyright IBM Corporation 2015, 2021