Skip to content

Commit 4312d29

Browse files
authored
Merge pull request #54984 from gaurav-nelson/travis-netlify-microshift
Use `4.13` for microshift and skip Netlify step for merge commits
2 parents 16fa27b + 0e1e098 commit 4312d29

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
script:
4343
- python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch && python3 makeBuild.py
4444
- # stage name not required, will continue to use `build`
45-
if: branch IN (main, enterprise-4.12)
45+
if: branch IN (main, enterprise-4.12, enterprise-4.13)
4646
name: "Build microshift distro"
4747
before_install:
4848
- gem install asciidoctor
@@ -75,7 +75,7 @@ jobs:
7575
env:
7676
- CAN_FAIL=true
7777
language: minimal
78-
if: branch IN (main, enterprise-4.12, enterprise-4.13) AND sender != "openshift-cherrypick-robot"
78+
if: type IN (pull_request) AND branch IN (main, enterprise-4.12, enterprise-4.13) AND sender != "openshift-cherrypick-robot"
7979
script:
8080
- chmod +x autopreview.sh && ./autopreview.sh
8181

_distro_map.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,3 +262,6 @@ microshift:
262262
enterprise-4.12:
263263
name: '4.12'
264264
dir: microshift/4.12
265+
enterprise-4.13:
266+
name: '4.13'
267+
dir: microshift/4.13

0 commit comments

Comments
 (0)