Skip to content

Commit 8ff8b03

Browse files
committed
[CI] Replace rules usage with only/except to correctly run nightlies
1 parent 1ca0e9d commit 8ff8b03

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

.gitlab/ci/centos-7.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ include: '/.gitlab/ci/platform-test.yml'
1111
swift trunk:
1212
extends: .centos7
1313
image: swiftlang/swift:nightly-master-centos7
14-
variables:
15-
RUN_NIGHTLY: 1
14+
except:
1615

1716
swift 5.5:
1817
extends: .centos7

.gitlab/ci/platform-test.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ stages:
1515
script:
1616
- swift build --build-tests --enable-test-discovery --sanitize=thread -v
1717
- swift test --skip-build
18-
rules:
19-
- if: '$CI_PIPELINE_SOURCE == "schedule" && $RUN_NIGHTLY'
20-
allow_failure: true
21-
when: always
22-
- if: '$CI_PIPELINE_SOURCE != "schedule"'
23-
when: always
18+
only:
19+
- branches
20+
- tags
21+
except:
22+
- schedules
2423

.gitlab/ci/standard-platforms.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ include: '/.gitlab/ci/platform-test.yml'
33
swift trunk:
44
extends: .platform-test
55
image: swiftlang/swift:nightly-master-${SWIFT_PLATFORM_NAME}
6-
variables:
7-
RUN_NIGHTLY: 1
6+
except:
87

98
swift 5.5:
109
extends: .platform-test

0 commit comments

Comments
 (0)