Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/detect-missing-caches/detect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ export const cacheWarmingJobs: Readonly<Record<string, ICacheWarmingJob>> = {
* depends on the home directory of the runners and is part of the cache version.
*/
const electronCachePaths: Readonly<Record<RunnerOs, string>> = {
Linux: '/home/cloudtest/.cache/electron',
Linux: '/home/runner/.cache/electron',
macOS: '/Users/runner/Library/Caches/electron',
Windows: 'C:\\Users\\cloudtest\\AppData\\Local\\electron\\Cache',
Windows: 'C:\\Users\\runneradmin\\AppData\\Local\\electron\\Cache',
};
Comment thread
Yoyokrazy marked this conversation as resolved.
Resolved

/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linux-cli-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Skip this job rather than the calling job: a skipped job still reports
# "<caller> / <job name>", which satisfies required status checks.
if: ${{ inputs.affected }}
runs-on: ubuntu-24.04
runs-on: vscode-large-runners-ubuntu-8-core
env:
RUSTUP_TOOLCHAIN: ${{ inputs.rustup_toolchain }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linux-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
jobs:
linux-test:
name: ${{ inputs.job_name }}
runs-on: ubuntu-24.04
runs-on: vscode-large-runners-ubuntu-8-core
env:
ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || (!inputs.unit_tests && !inputs.integration_tests && inputs.smoke_tests && '-smoke') || '' }}${{ inputs.smoke_shard_total > 1 && format('-shard{0}', inputs.smoke_shard_index) || '' }}
NPM_ARCH: x64
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-node-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
name: Compile
needs: caches
if: ${{ !cancelled() && (needs.caches.result != 'success' || needs.caches.outputs.compile == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=compile-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
name: Linux
needs: caches
if: ${{ !cancelled() && (needs.caches.result != 'success' || needs.caches.outputs.linux == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=linux-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
env:
NPM_ARCH: x64
VSCODE_ARCH: x64
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
name: Windows
needs: caches
if: ${{ !cancelled() && (needs.caches.result != 'success' || needs.caches.outputs.windows == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64, "JobId=windows-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-windows-8-core
env:
NPM_ARCH: x64
VSCODE_ARCH: x64
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
name: Copilot (Linux)
needs: caches
if: ${{ !cancelled() && (needs.caches.result != 'success' || needs.caches.outputs.copilot-linux == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=copilot-linux-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -403,7 +403,7 @@ jobs:
name: Copilot (Windows)
needs: caches
if: ${{ !cancelled() && (needs.caches.result != 'success' || needs.caches.outputs.copilot-windows == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64, "JobId=copilot-windows-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-windows-8-core
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pr-win32-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ on:
jobs:
windows-test:
name: ${{ inputs.job_name }}
# JobId must be unique per job, so smoke test shards and the browser unit tests part add a suffix
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64, "JobId=windows-test-${{ inputs.job_name }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || '' }}${{ inputs.smoke_shard_total > 1 && format('-shard{0}', inputs.smoke_shard_index) || '' }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-windows-8-core
env:
ARTIFACT_NAME: ${{ (inputs.electron_tests && 'electron') || (inputs.browser_tests && 'browser') || (inputs.remote_tests && 'remote') || 'unknown' }}${{ (inputs.unit_tests && !inputs.integration_tests && '-unit') || (!inputs.unit_tests && !inputs.integration_tests && inputs.smoke_tests && '-smoke') || '' }}${{ inputs.smoke_shard_total > 1 && format('-shard{0}', inputs.smoke_shard_index) || '' }}
NPM_ARCH: x64
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

compile:
name: Compile & Hygiene
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=compile-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
steps:
- name: Checkout microsoft/vscode
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
Expand Down Expand Up @@ -480,7 +480,7 @@ jobs:
name: Copilot - Check Test Cache
needs: changes
if: ${{ !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.copilot == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=copilot-check-test-cache-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
permissions:
contents: read
pull-requests: read
Expand Down Expand Up @@ -527,7 +527,7 @@ jobs:
name: Copilot - Check Telemetry
needs: changes
if: ${{ !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.copilot == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=copilot-check-telemetry-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
permissions:
contents: read
steps:
Expand All @@ -548,7 +548,7 @@ jobs:
name: Copilot - Test (Linux)
needs: changes
if: ${{ !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.copilot == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64, "JobId=copilot-linux-tests-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-ubuntu-8-core
permissions:
contents: read
steps:
Expand Down Expand Up @@ -648,7 +648,7 @@ jobs:
name: Copilot - Test (Windows)
needs: changes
if: ${{ !cancelled() && (needs.changes.result != 'success' || needs.changes.outputs.copilot == 'true') }}
runs-on: [ self-hosted, 1ES.Pool=1es-vscode-oss-windows-2022-x64, "JobId=copilot-windows-tests-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" ]
runs-on: vscode-large-runners-windows-8-core
permissions:
contents: read
steps:
Expand Down
4 changes: 2 additions & 2 deletions build/lib/test/detectMissingCaches.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ function readRepositoryFile(relativePath: string): Buffer {
* The runners of the cache warming jobs, as the cache keys see them.
*/
const runners: Record<string, { platform: string; arch: string; os: ICacheWarmingJob['os'] }> = {
'1ES.Pool=1es-vscode-oss-ubuntu-22.04-x64': { platform: 'linux', arch: 'x64', os: 'Linux' },
'1ES.Pool=1es-vscode-oss-windows-2022-x64': { platform: 'win32', arch: 'x64', os: 'Windows' },
'vscode-large-runners-ubuntu-8-core': { platform: 'linux', arch: 'x64', os: 'Linux' },
'vscode-large-runners-windows-8-core': { platform: 'win32', arch: 'x64', os: 'Windows' },
'macos-26-xlarge': { platform: 'darwin', arch: 'arm64', os: 'macOS' },
};

Expand Down
Loading