From a73942ca9dfed6d91c2df31a679d44fbb96be2ca Mon Sep 17 00:00:00 2001
From: Gabriel-Ladzaretti
<97394622+Gabriel-Ladzaretti@users.noreply.github.com>
Date: Sat, 4 Jun 2022 10:53:24 +0300
Subject: [PATCH] fix(circleci): add android to machine image skipping (#15792)
---
lib/modules/manager/circleci/extract.spec.ts | 19 +++++++++++++++----
lib/modules/manager/circleci/extract.ts | 4 +++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/lib/modules/manager/circleci/extract.spec.ts b/lib/modules/manager/circleci/extract.spec.ts
index 1d0ba0275a..b6c6fe1b77 100644
--- a/lib/modules/manager/circleci/extract.spec.ts
+++ b/lib/modules/manager/circleci/extract.spec.ts
@@ -1,9 +1,9 @@
-import { loadFixture } from '../../../../test/util';
+import { Fixtures } from '../../../../test/fixtures';
import { extractPackageFile } from './extract';
-const file1 = loadFixture('config.yml');
-const file2 = loadFixture('config2.yml');
-const file3 = loadFixture('config3.yml');
+const file1 = Fixtures.get('config.yml');
+const file2 = Fixtures.get('config2.yml');
+const file3 = Fixtures.get('config3.yml');
describe('modules/manager/circleci/extract', () => {
describe('extractPackageFile()', () => {
@@ -53,5 +53,16 @@ describe('modules/manager/circleci/extract', () => {
{ currentValue: '14.8.0', depName: 'cimg/node' },
]);
});
+
+ it('extracts and exclude android images', () => {
+ expect(
+ extractPackageFile(
+ 'jobs:\n' +
+ ' build:\n' +
+ ' machine:\n' +
+ ' image: android:202102-01'
+ )
+ ).toBeNull();
+ });
});
});
diff --git a/lib/modules/manager/circleci/extract.ts b/lib/modules/manager/circleci/extract.ts
index f3e85dd844..6c03b1e69b 100644
--- a/lib/modules/manager/circleci/extract.ts
+++ b/lib/modules/manager/circleci/extract.ts
@@ -63,7 +63,9 @@ export function extractPackageFile(content: string): PackageFile | null {
dep.versioning = 'docker';
if (
!dep.depName?.startsWith('ubuntu-') &&
- !dep.depName?.startsWith('windows-server-')
+ !dep.depName?.startsWith('windows-server-') &&
+ !dep.depName?.startsWith('android-') &&
+ dep.depName !== 'android'
) {
deps.push(dep);
}
--
GitLab