diff options
author | Thomas Haller <thaller@redhat.com> | 2021-04-01 21:40:23 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-04-01 21:43:01 +0200 |
commit | 371b64bd70bfbfdcda2b4f3229687f3466c0a383 (patch) | |
tree | ca8890c8859392f47b74d486a1c30a2aff8b9422 | |
parent | f0612bd67b96ec67877a37f0420b0f28b7cb4283 (diff) | |
download | NetworkManager-371b64bd70bfbfdcda2b4f3229687f3466c0a383.tar.gz |
gilab-ci: update .gitlab-ci.yml to use "main" branch name
-rw-r--r-- | .gitlab-ci.yml | 12 | ||||
-rw-r--r-- | .gitlab-ci/ci.template | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc7b2b55f3..2830e676f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,11 +44,11 @@ variables: # these tags should be updated each time the list of packages is updated # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular NM version - FEDORA_TAG: '2021-01-28.0-5ee9fa53946e' - UBUNTU_TAG: '2021-01-28.0-b172a9697407' - DEBIAN_TAG: '2021-01-28.0-b172a9697407' - CENTOS_TAG: '2021-01-28.0-5ee9fa53946e' - ALPINE_TAG: '2021-01-28.0-76f28d039de3' + FEDORA_TAG: '2021-01-28.0-204b637c4b94' + UBUNTU_TAG: '2021-01-28.0-397adbc67ac4' + DEBIAN_TAG: '2021-01-28.0-397adbc67ac4' + CENTOS_TAG: '2021-01-28.0-204b637c4b94' + ALPINE_TAG: '2021-01-28.0-35b8aa24ed67' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -890,7 +890,7 @@ pages: paths: - public only: - - master + - main dependencies: - t_fedora:33 needs: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index f8f13395e4..8ee2c89541 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -213,7 +213,7 @@ pages: paths: - public only: - - master + - main dependencies: - t_{{pages_build.name}}:{{pages_build.version}} needs: |