Merge branch 'epic13-s-bringup' into 'master'

gitlab-ci: Add support for v1-s

See merge request e/templates!4

gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml

+6 −0

Original line number	Diff line number	Diff line
		@@ -62,3 +62,9 @@ r:
		variables:
		UPSTREAM_BRANCH: lineage-18.1
		LOCAL_BRANCH: v1-r

		s:
		extends: .update-from-upstream
		variables:
		UPSTREAM_BRANCH: lineage-19.1
		LOCAL_BRANCH: v1-s