Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

remove deprecated only/except clauses #7229

Merged
TriplEight merged 18 commits into from
Sep 30, 2020
Merged

remove deprecated only/except clauses #7229

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bd05206
change (CI): remove deprecated only/except clauses
TriplEight Sep 28, 2020
daf1c95
change (CI): remove
TriplEight Sep 28, 2020
75453df
change (CI): debug regex
TriplEight Sep 28, 2020
ccd0cb5
change (CI): regex shouldn't be surrounded with quotes in `rules`
TriplEight Sep 28, 2020
197ce9b
change (CI): no quotes in `rules`
TriplEight Sep 28, 2020
78b7ab9
change (CI): debug workflow
TriplEight Sep 28, 2020
849349b
change (CI): almost equal
TriplEight Sep 28, 2020
ea1ec75
change (CI): splinters
TriplEight Sep 28, 2020
86d1a07
change (CI): some details [chaos:basic]
TriplEight Sep 28, 2020
57ea603
Merge remote-tracking branch 'origin' into only-except_to-rules
TriplEight Sep 30, 2020
a8e10ce
change (CI): add manual substrate build on PRs
TriplEight Sep 30, 2020
08641d0
change (CI): mistake with publish-to-crates-io
TriplEight Sep 30, 2020
2d3c968
change (CI): reapproach chaos-only; rename rules anchors [skip ci]
TriplEight Sep 30, 2020
4dfc1d8
change (CI): add linux and mac to manual jobs for PRs [skip ci]
TriplEight Sep 30, 2020
ce3f3c8
change (CI): remove `pre-v` tags rules [skip ci]
TriplEight Sep 30, 2020
ffac0c4
change (CI): add subkey for macos build as manual on PRs as well
TriplEight Sep 30, 2020
97e46e3
change (CI): add glob to match every changed file in monitoring
TriplEight Sep 30, 2020
51fc167
test (CI): [chaos:basic]
TriplEight Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change (CI): regex shouldn't be surrounded with quotes in rules
  • Loading branch information
@TriplEight
TriplEight committed Sep 28, 2020
commit ccd0cb50c869e9ff71e170e205ab71cb815705a4
65 changes: 32 additions & 33 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,23 +86,22 @@ workflow:
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_COMMIT_REF_NAME == "master"'
# - if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == "7229"' # PRs
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1

.build-rules: &build-rules
rules:
- if: '$CI_COMMIT_REF_NAME == "master"'
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ "/^pre-v[0-9]+\.[0-9]+-[0-9a-f]+$/"' # i.e. pre-v1.0, pre-v2.1rc1
- if: '$CI_COMMIT_MESSAGE =~ "/\[chaos:(basic|medium|large)\]/"
&& $CI_COMMIT_REF_NAME =~ "/^[0-9]+$/"' # i.e add [chaos:basic] in commit message to trigger
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ /^pre-v[0-9]+\.[0-9]+-[0-9a-f]+$/' # i.e. pre-v1.0, pre-v2.1rc1
- if: '$CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/
&& $CI_COMMIT_REF_NAME =~ /^[0-9]+$/' # i.e add [chaos:basic] in commit message to trigger

.chaos-only: &chaos-only
rules:
- if: '$CI_COMMIT_MESSAGE =~ "/\[chaos:(basic|medium|large)\]/"
&& $CI_COMMIT_REF_NAME =~ "/^[0-9]+$/"' # i.e add [chaos:basic] in commit message to trigger
- if: '$CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/
&& $CI_COMMIT_REF_NAME =~ /^[0-9]+$/' # i.e add [chaos:basic] in commit message to trigger

#### stage: .pre

Expand All @@ -111,7 +110,7 @@ skip-if-draft:
<<: *kubernetes-build
stage: .pre
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
script:
- echo "Commit message is ${CI_COMMIT_MESSAGE}"
- echo "Ref is ${CI_COMMIT_REF_NAME}"
Expand All @@ -125,7 +124,7 @@ check-runtime:
image: paritytech/tools:latest
<<: *kubernetes-build
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
variables:
<<: *default-vars
GITLAB_API: "https://gitlab.parity.io/api/v4"
Expand All @@ -139,8 +138,8 @@ check-signed-tag:
image: paritytech/tools:latest
<<: *kubernetes-build
rules:
- if: '$CI_COMMIT_REF_NAME =~ "/^ci-release-.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+\.[0-9]+.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ /^ci-release-.*$/'
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/'
script:
- ./.maintain/gitlab/check_signed.sh

Expand All @@ -149,7 +148,7 @@ check-line-width:
image: paritytech/tools:latest
<<: *kubernetes-build
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
script:
- ./.maintain/gitlab/check_line_width.sh
allow_failure: true
Expand All @@ -167,12 +166,12 @@ cargo-audit:
stage: test
<<: *docker-env
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
when: never
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_COMMIT_REF_NAME == "master"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
script:
- cargo audit
allow_failure: true
Expand All @@ -181,14 +180,14 @@ cargo-deny:
stage: test
<<: *docker-env
rules:
- if: '$CI_COMMIT_MESSAGE =~ "/skip-checks/"'
- if: '$CI_COMMIT_MESSAGE =~ /skip-checks/'
when: never
# .docker-env-rules
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_COMMIT_REF_NAME == "master"'
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
script:
- cargo deny check --hide-inclusion-graph -c .maintain/deny.toml
after_script:
Expand Down Expand Up @@ -260,14 +259,14 @@ unleash-check:
stage: test
<<: *docker-env
rules:
- if: '$CI_COMMIT_MESSAGE =~ "/skip-checks/"'
- if: '$CI_COMMIT_MESSAGE =~ /skip-checks/'
when: never
# .docker-env-rules
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_COMMIT_REF_NAME == "master"'
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash check ${CARGO_UNLEASH_PKG_DEF}
Expand Down Expand Up @@ -373,7 +372,7 @@ check-polkadot-companion-status:
image: paritytech/tools:latest
<<: *kubernetes-build
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
script:
- ./.maintain/gitlab/check_polkadot_companion_status.sh

Expand Down Expand Up @@ -460,7 +459,7 @@ build-macos-subkey:
<<: *build-subkey
rules:
- if: '$CI_COMMIT_REF_NAME == "master"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
tags:
- osx

Expand Down Expand Up @@ -685,8 +684,8 @@ publish-draft-release:
stage: publish
image: paritytech/tools:latest
rules:
- if: '$CI_COMMIT_REF_NAME =~ "/^ci-release-.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+\.[0-9]+.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ /^ci-release-.*$/'
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/'
script:
- ./.maintain/gitlab/publish_draft_release.sh
allow_failure: true
Expand All @@ -696,8 +695,8 @@ publish-to-crates-io:
<<: *docker-env
<<: *docker-env-rules
rules:
- if: '$CI_COMMIT_REF_NAME =~ "/^ci-release-.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+\.[0-9]+.*$/"'
- if: '$CI_COMMIT_REF_NAME =~ /^ci-release-.*$/'
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+\.[0-9]+.*$/'
script:
- cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
- cargo unleash em-dragons --no-check --owner github:paritytech:core-devs ${CARGO_UNLEASH_PKG_DEF}
Expand Down Expand Up @@ -738,12 +737,12 @@ deploy-kubernetes-alerting-rules:
when: manual
- if: '$CI_PIPELINE_SOURCE == "web"'
when: manual
- if: '$CI_COMMIT_REF_NAME =~ "/^v[0-9]+\.[0-9]+.*$/"' # i.e. v1.0, v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/' # i.e. v1.0, v2.1rc1
when: manual
- if: '$CI_COMMIT_REF_NAME =~ "/^pre-v[0-9]+\.[0-9]+-[0-9a-f]+$/"' # i.e. pre-v1.0, pre-v2.1rc1
- if: '$CI_COMMIT_REF_NAME =~ /^pre-v[0-9]+\.[0-9]+-[0-9a-f]+$/' # i.e. pre-v1.0, pre-v2.1rc1
when: manual
- if: '$CI_COMMIT_MESSAGE =~ "/\[chaos:(basic|medium|large)\]/"
&& $CI_COMMIT_REF_NAME =~ "/^[0-9]+$/"' # i.e add [chaos:basic] in commit message to trigger
- if: '$CI_COMMIT_MESSAGE =~ /\[chaos:(basic|medium|large)\]/
&& $CI_COMMIT_REF_NAME =~ /^[0-9]+$/' # i.e add [chaos:basic] in commit message to trigger
when: manual
needs:
# script will fail if there is no artifacts/substrate/VERSION
Expand Down Expand Up @@ -782,6 +781,6 @@ check-labels:
image: paritytech/tools:latest
<<: *kubernetes-build
rules:
- if: '$CI_COMMIT_REF_NAME == "/^[0-9]+$/"' # PRs
- if: '$CI_COMMIT_REF_NAME == /^[0-9]+$/' # PRs
script:
- ./.maintain/gitlab/check_labels.sh