diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-09 09:09:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-09 09:09:38 +0300 |
| commit | 90dcdab92f36119aa17a5b9eeae2adad806c04cc (patch) | |
| tree | 1f730647303bb45b59c0837466a01f98bc833410 | |
| parent | 11c6346b54ac6418e4ead496bcc632cf88065a74 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | workhorse/.tool-versions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 11d3f90c24a..9051532b0d1 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -160,7 +160,7 @@ gdk-qa-reliable: QA_RUN_TYPE: gdk-qa-blocking parallel: 10 rules: - - if: $CI_MERGE_REQUEST_LABELS =~ /devops::govern|devops::create|devops::verify/ + - if: $CI_MERGE_REQUEST_LABELS =~ /devops::govern|devops::create|devops::verify|devops::manage|devops::data stores/ - when: on_success allow_failure: true diff --git a/workhorse/.tool-versions b/workhorse/.tool-versions index 6d1d0fb759f..e4ab54ccd08 100644 --- a/workhorse/.tool-versions +++ b/workhorse/.tool-versions @@ -1 +1 @@ -golang 1.20.7 +golang 1.21.1 |