Loading .gitlab-ci.yml +4 −16 Original line number Diff line number Diff line Loading @@ -6,24 +6,12 @@ stages: - build include: - project: 'e/templates' - project: "e/templates" ref: master file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' file: "/gitlab-ci/.gitlab-ci-auto-merge-main.yml" - project: "e/templates" ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' auto_merge_main: extends: .auto-merge-main variables: BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/ TARGET_BRANCH: main upstream_main: extends: .update-from-upstream variables: UPSTREAM_BRANCH: lineage-23.2 LOCAL_BRANCH: main file: "/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml" before_script: - export GRADLE_USER_HOME="$CI_PROJECT_DIR/.gradle" Loading Loading
.gitlab-ci.yml +4 −16 Original line number Diff line number Diff line Loading @@ -6,24 +6,12 @@ stages: - build include: - project: 'e/templates' - project: "e/templates" ref: master file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' file: "/gitlab-ci/.gitlab-ci-auto-merge-main.yml" - project: "e/templates" ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' auto_merge_main: extends: .auto-merge-main variables: BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/ TARGET_BRANCH: main upstream_main: extends: .update-from-upstream variables: UPSTREAM_BRANCH: lineage-23.2 LOCAL_BRANCH: main file: "/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml" before_script: - export GRADLE_USER_HOME="$CI_PROJECT_DIR/.gradle" Loading