File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -806,9 +806,12 @@ export async function upgradesFindCL(
806
806
cwd : electronRoot . fsPath ,
807
807
encoding : "utf8" ,
808
808
} ) . then ( ( { stdout } ) => stdout . trim ( ) ) ;
809
- if ( branchName !== "roller/chromium/main" ) {
809
+ if (
810
+ branchName !== "roller/chromium/main" &&
811
+ ! / ^ r o l l e r \/ c h r o m i u m \/ \d + - x - y $ / . test ( branchName )
812
+ ) {
810
813
stream . markdown (
811
- "Confirm you have a Chromium roll branch checked out - only `roller/chromium/main is supported for now ." ,
814
+ "Confirm you have a Chromium roll branch checked out - only `roller/chromium/main` and `roller/chromium/*-x-y` are supported ." ,
812
815
) ;
813
816
return { } ;
814
817
}
@@ -825,7 +828,7 @@ export async function upgradesFindCL(
825
828
compareChromiumVersions ( versions . newVersion , versions . previousVersion ) <= 0
826
829
) {
827
830
stream . markdown (
828
- "Chromium version in this branch is the same or older than `origin/main` ." ,
831
+ "Chromium version in this branch is the same or older than its parent ." ,
829
832
) ;
830
833
return { } ;
831
834
}
You can’t perform that action at this time.
0 commit comments