File tree Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Expand file tree Collapse file tree 3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ import { getOctokit } from './octokit';
4
4
5
5
const WINDOWS_RUNNER_REGEX = / A R G R U N N E R _ V E R S I O N = ( [ \d . ] + ) / ;
6
6
const WINDOWS_IMAGE_REGEX =
7
- / e l e c t r o n a r c \. a z u r e c r \. i o \/ w i n - a c t i o n s - r u n n e r : m a i n - [ a - f 0 - 9 ] { 7 } @ s h a 2 5 6 : [ a - f 0 - 9 ] { 64 } / ;
7
+ / \$ \{ r e g i s t r y _ n a m e \} \. a z u r e c r \. i o \/ w i n - a c t i o n s - r u n n e r : m a i n - [ a - f 0 - 9 ] { 7 } @ s h a 2 5 6 : [ a - f 0 - 9 ] { 64 } / ;
8
8
const LINUX_IMAGE_REGEX =
9
9
/ i f e q .c p u A r c h " a m d 6 4 " .* \n .* i m a g e : g h c r .i o \/ a c t i o n s \/ a c t i o n s - r u n n e r : ( [ 0 - 9 ] + \. [ 0 - 9 ] + \. [ 0 - 9 ] + @ s h a 2 5 6 : [ a - f 0 - 9 ] { 64 } ) .* \n .* { { - e l s e } } .* \n .* i m a g e : g h c r .i o \/ a c t i o n s \/ a c t i o n s - r u n n e r : ( [ 0 - 9 ] + \. [ 0 - 9 ] + \. [ 0 - 9 ] + @ s h a 2 5 6 : [ a - f 0 - 9 ] { 64 } ) / ;
10
10
Original file line number Diff line number Diff line change @@ -39,7 +39,10 @@ async function getLatestVersionOfImage() {
39
39
bestMainTag = mainTag ;
40
40
}
41
41
}
42
- return [ `electronarc.azurecr.io/win-actions-runner:${ bestMainTag } @${ best . name } ` , bestMainTag ] ;
42
+ return [
43
+ `\${registry_name}.azurecr.io/win-actions-runner:${ bestMainTag } @${ best . name } ` ,
44
+ bestMainTag ,
45
+ ] ;
43
46
}
44
47
45
48
const WINDOWS_IMAGE_DOCKERFILE_PATH = 'docker/windows-actions-runner/Dockerfile' ;
Original file line number Diff line number Diff line change 5
5
getCurrentWindowsRunnerVersion ,
6
6
} from '../../src/utils/arc-image' ;
7
7
8
- const windowsImageContent = `electronarc.azurecr.io/win-actions-runner:main-abcdef0@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef` ;
8
+ const windowsImageContent =
9
+ '${registry_name}.azurecr.io/win-actions-runner:main-abcdef0@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' ;
9
10
10
11
const linuxImageContent = `containers:
11
12
- name: runner
@@ -32,7 +33,7 @@ const invalidLinuxContent = `{{- if eq .cpuArch "amd64" }}\nimage: something-els
32
33
describe ( 'arc-image utils' , ( ) => {
33
34
it ( 'should extract the current Windows image' , ( ) => {
34
35
expect ( currentWindowsImage ( windowsImageContent ) ) . toBe (
35
- 'electronarc .azurecr.io/win-actions-runner:main-abcdef0@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' ,
36
+ '${registry_name} .azurecr.io/win-actions-runner:main-abcdef0@sha256:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' ,
36
37
) ;
37
38
} ) ;
38
39
You can’t perform that action at this time.
0 commit comments