From b5417f998ae0cbe31f4da587cadecef6fe4fcb2d Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Fri, 7 Jan 2022 01:45:54 +0000 Subject: [PATCH] Use `main` as default branch --- .gitlab-ci.yml | 6 +++--- security-scanner/security_scanner/__main__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index babc669..85be239 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,15 +104,15 @@ squashfs_featurebranch: variables: - $task == "security-scanner" refs: - - master + - main -squashfs_master: +squashfs_main: <<: *squashfs_template variables: COMPRESSION_LEVEL: 15 only: refs: - - master + - main except: variables: - $task == "security-scanner" diff --git a/security-scanner/security_scanner/__main__.py b/security-scanner/security_scanner/__main__.py index c19cc64..e430bb7 100644 --- a/security-scanner/security_scanner/__main__.py +++ b/security-scanner/security_scanner/__main__.py @@ -33,7 +33,7 @@ if __name__ == '__main__': api_token = os.environ.get('PRIVATE_TOKEN') gitlab = GitLab(gitlab_url, project_id, api_token) for distro in sys.argv[1:]: - job = gitlab.getLastSuccessfulJob('master', 'squashfs_master') + job = gitlab.getLastSuccessfulJob('main', 'squashfs_main') if job is not None: gitlab.downloadArtifact(job, 'images/debian-' + distro + '.dpkg-list', 'debian-' + distro + '.dpkg-list') if checkDebianDistro(distro) > 0: