Samuel Attard 1 year ago
parent
commit
0627ff8683
2 changed files with 9 additions and 3 deletions
  1. 8 3
      .circleci/config/base.yml
  2. 1 0
      .circleci/config/params.js

+ 8 - 3
.circleci/config/base.yml

@@ -34,6 +34,11 @@ parameters:
     type: enum
     default: all
     enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
+
+  medium-linux-executor:
+    type: enum
+    default: electronjs/aks-linux-medium
+    enum: ["electronjs/aks-linux-medium", "medium"]
   
   large-linux-executor:
     type: enum
@@ -49,7 +54,7 @@ executors:
         type: enum
         # aks-linux-large === 32 core
         # 2xlarge should not be used directly, use the pipeline param instead
-        enum: ["medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
+        enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
     docker:
       - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
     resource_class: << parameters.size >>
@@ -1875,7 +1880,7 @@ jobs:
   linux-x64-testing-gn-check:
     executor:
       name: linux-docker
-      size: medium
+      size: << pipeline.parameters.medium-linux-executor >>
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
@@ -1973,7 +1978,7 @@ jobs:
   linux-arm64-testing-gn-check:
     executor:
       name: linux-docker
-      size: medium
+      size: << pipeline.parameters.medium-linux-executor >>
     environment:
       <<: *env-linux-medium
       <<: *env-arm64

+ 1 - 0
.circleci/config/params.js

@@ -7,5 +7,6 @@ const content = JSON.parse(fs.readFileSync(PARAMS_PATH, 'utf-8'));
 // Choose resource class for linux hosts
 const currentBranch = process.env.CIRCLE_BRANCH || '';
 content['large-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? '2xlarge' : 'electronjs/aks-linux-large';
+content['medium-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? 'medium' : 'electronjs/aks-linux-medium';
 
 fs.writeFileSync(PARAMS_PATH, JSON.stringify(content));