Skip to content

Commit eb14219

Browse files
authored
feat: update infrastructure to use macOS 14 (#210)
Issue #, if available: - runfinch/finch#680 *Description of changes:* - runfinch/infrastructure#496 - Updated CI to use 14 for e2e testing *Testing done:* - none - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. Signed-off-by: Weike Qu <[email protected]>
1 parent 0fe4887 commit eb14219

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

.github/workflows/cdk-e2e.yaml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@ on:
55
workflow_dispatch:
66
# Run every day at 12am
77
schedule:
8-
- cron: '0 0 * * *'
9-
8+
- cron: "0 0 * * *"
9+
1010
jobs:
1111
build-and-test:
1212
strategy:
1313
fail-fast: false
14-
matrix:
15-
os: [[self-hosted, macos, amd64, 13, test], [self-hosted, macos, amd64, 12, test], [self-hosted, macos, arm64, 13, test], [self-hosted, macos, arm64, 12, test]]
14+
matrix:
15+
os:
16+
[
17+
[self-hosted, macos, amd64, 13, test],
18+
[self-hosted, macos, amd64, 14, test],
19+
[self-hosted, macos, arm64, 13, test],
20+
[self-hosted, macos, arm64, 14, test],
21+
]
1622
runs-on: ${{ matrix.os }}
1723
steps:
18-
# Cleanup
24+
# Cleanup
1925
- name: Cleanup Workspace
2026
run: |
2127
sudo rm -rf *
@@ -28,7 +34,7 @@ jobs:
2834
if pgrep '^socket_vmnet'; then
2935
sudo pkill '^socket_vmnet'
3036
fi
31-
37+
3238
- name: Checkout AWS CDK main branch
3339
uses: actions/checkout@v4
3440
with:
@@ -38,7 +44,7 @@ jobs:
3844
- name: Configure Node.js version
3945
uses: actions/setup-node@v4
4046
with:
41-
node-version: '18'
47+
node-version: "18"
4248

4349
- name: Install dependencies
4450
run: |
@@ -47,10 +53,10 @@ jobs:
4753
4854
# Setting Node options and running lerna build
4955
- name: Build with lerna
50-
run: |
56+
run: |
5157
npx lerna run build
5258
npm install -g @aws-cdk/integ-tests
53-
npm install -g @aws-cdk/core
59+
npm install -g @aws-cdk/core
5460
env:
5561
NODE_OPTIONS: "--max-old-space-size=8192"
5662

@@ -60,9 +66,9 @@ jobs:
6066
repository: runfinch/finch
6167
ref: main
6268
path: finch-temp
63-
submodules: 'recursive'
69+
submodules: "recursive"
6470

65-
# Setup Go using version specified in go.mod
71+
# Setup Go using version specified in go.mod
6672
- name: Setup Go from Finch's go.mod
6773
uses: actions/setup-go@v5
6874
with:
@@ -87,7 +93,7 @@ jobs:
8793
- name: Run integration tests
8894
uses: nick-fields/retry@v2
8995
with:
90-
timeout_minutes: 180
91-
max_attempts: 3
92-
# Drop in replacement for docker in CDK https://github.com/aws/aws-cdk/blob/b23252b99559ad1a1f0e05b6936c60f9c52522ff/packages/cdk-assets/README.md?plain=1#L185
93-
command: CDK_DOCKER=finch yarn integ-runner --max-workers=1 --directory packages/@aws-cdk-testing/framework-integ
96+
timeout_minutes: 180
97+
max_attempts: 3
98+
# Drop in replacement for docker in CDK https://github.com/aws/aws-cdk/blob/b23252b99559ad1a1f0e05b6936c60f9c52522ff/packages/cdk-assets/README.md?plain=1#L185
99+
command: CDK_DOCKER=finch yarn integ-runner --max-workers=1 --directory packages/@aws-cdk-testing/framework-integ

.github/workflows/ci.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
branches:
55
- main
66
paths-ignore:
7-
- '**.md'
8-
- 'src/**'
7+
- "**.md"
8+
- "src/**"
99
pull_request:
1010
branches:
1111
- main
1212
paths-ignore:
13-
- '**.md'
14-
- 'contrib/**'
15-
- 'Dockerfile'
13+
- "**.md"
14+
- "contrib/**"
15+
- "Dockerfile"
1616
workflow_dispatch:
1717

1818
concurrency:
@@ -24,7 +24,13 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
os: [[self-hosted, macos, amd64, 13, test], [self-hosted, macos, amd64, 12, test], [self-hosted, macos, arm64, 13, test], [self-hosted, macos, arm64, 12, test]]
27+
os:
28+
[
29+
[self-hosted, macos, amd64, 13, test],
30+
[self-hosted, macos, amd64, 14, test],
31+
[self-hosted, macos, arm64, 13, test],
32+
[self-hosted, macos, arm64, 14, test],
33+
]
2834
runs-on: ${{ matrix.os }}
2935
steps:
3036
- name: Checkout code

0 commit comments

Comments
 (0)