Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into beta-releases
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Oct 7, 2024
2 parents 674b31a + 35bf965 commit 3747921
Show file tree
Hide file tree
Showing 200 changed files with 25,153 additions and 26,806 deletions.
27 changes: 20 additions & 7 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,48 +49,61 @@ const PACKAGE_BUILD_VARIANTS = [
{
name: 'package-macos-x64',
display_name: 'Package MacOS Intel',
run_on: 'macos-1100',
run_on: 'macos-14',
silk_asset_group: 'compass-macos',
},
{
name: 'package-macos-arm',
display_name: 'Package MacOS Arm64',
run_on: 'macos-1100-arm64',
run_on: 'macos-14-arm64',
silk_asset_group: 'compass-macos-arm',
}
];
const TEST_PACKAGED_APP_BUILD_VARIANTS = [
{
name: 'test-server-ubuntu',
name: 'test-packaged-app-ubuntu',
display_name: 'Ubuntu 20.04',
run_on: 'ubuntu2004-large',
depends_on: 'package-ubuntu',
},
{
name: 'test-server-windows',
name: 'test-packaged-app-windows',
display_name: 'Windows 10',
run_on: 'windows-vsCurrent-large',
depends_on: 'package-windows',
},
{
name: 'test-server-rhel',
name: 'test-packaged-app-rhel',
display_name: 'RHEL 8.0',
run_on: 'rhel80-large',
depends_on: 'package-rhel',
},
{
name: 'test-server-macos-11-arm',
name: 'test-packaged-app-macos-11-arm',
display_name: 'MacOS arm64 11',
run_on: 'macos-1100-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-server-macos-11-x64',
name: 'test-packaged-app-macos-11-x64',
display_name: 'MacOS x64 11',
run_on: 'macos-1100-gui',
patchable: false,
depends_on: 'package-macos-x64'
},
{
name: 'test-packaged-app-macos-14-arm',
display_name: 'MacOS arm64 14',
run_on: 'macos-14-arm64-gui',
depends_on: 'package-macos-arm'
},
{
name: 'test-packaged-app-macos-14-x64',
display_name: 'MacOS x64 14',
run_on: 'macos-14-gui',
patchable: false,
depends_on: 'package-macos-x64'
}
];
Expand Down
36 changes: 29 additions & 7 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ buildvariants:
expansions:
silk_asset_group: compass-macos
display_name: Package MacOS Intel
run_on: macos-1100
run_on: macos-14
tasks:
- name: package-compass
- name: package-compass-isolated
Expand All @@ -71,7 +71,7 @@ buildvariants:
expansions:
silk_asset_group: compass-macos-arm
display_name: Package MacOS Arm64
run_on: macos-1100-arm64
run_on: macos-14-arm64
tasks:
- name: package-compass
- name: package-compass-isolated
Expand Down Expand Up @@ -145,7 +145,7 @@ buildvariants:
- name: test-server-latest-alpha-1
- name: test-server-latest-alpha-2
- name: test-server-latest-alpha-3
- name: test-server-ubuntu
- name: test-packaged-app-ubuntu
display_name: Test Packaged App Ubuntu 20.04
run_on: ubuntu2004-large
patchable: true
Expand All @@ -156,7 +156,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-windows
- name: test-packaged-app-windows
display_name: Test Packaged App Windows 10
run_on: windows-vsCurrent-large
patchable: true
Expand All @@ -167,7 +167,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-rhel
- name: test-packaged-app-rhel
display_name: Test Packaged App RHEL 8.0
run_on: rhel80-large
patchable: true
Expand All @@ -178,7 +178,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-macos-11-arm
- name: test-packaged-app-macos-11-arm
display_name: Test Packaged App MacOS arm64 11
run_on: macos-1100-arm64-gui
patchable: true
Expand All @@ -189,7 +189,7 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-server-macos-11-x64
- name: test-packaged-app-macos-11-x64
display_name: Test Packaged App MacOS x64 11
run_on: macos-1100-gui
patchable: false
Expand All @@ -200,6 +200,28 @@ buildvariants:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-arm
display_name: Test Packaged App MacOS arm64 14
run_on: macos-14-arm64-gui
patchable: true
depends_on:
- name: package-compass
variant: package-macos-arm
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: test-packaged-app-macos-14-x64
display_name: Test Packaged App MacOS x64 14
run_on: macos-14-gui
patchable: false
depends_on:
- name: package-compass
variant: package-macos-x64
tasks:
- name: test-packaged-app-1
- name: test-packaged-app-2
- name: test-packaged-app-3
- name: publish
display_name: Publish Artifacts
run_on: ubuntu2004-large
Expand Down
10 changes: 5 additions & 5 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ variables:

# This is here with the variables because anchors aren't supported across includes
post:
- command: shell.exec
- command: archive.targz_pack
params:
working_dir: src
shell: bash
script: |
tar czf all-e2e-logs.tgz packages/compass-e2e-tests/.log
target: src/all-e2e-logs.tgz
source_dir: src/packages/compass-e2e-tests/.log
include:
- "**"
- command: s3.put
params:
<<: *save-artifact-params-private
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,4 @@ Betsy Button <[email protected]>
Vivian Xiao <[email protected]>
admin-token-bot <[email protected]>
Kræn Hansen <[email protected]>
Kræn Hansen <[email protected]>
Loading

0 comments on commit 3747921

Please sign in to comment.