Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update infrastructure to use macOS 14 #210

Merged
merged 1 commit into from
Dec 7, 2023
Merged
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
36 changes: 21 additions & 15 deletions .github/workflows/cdk-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,23 @@ on:
workflow_dispatch:
# Run every day at 12am
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

jobs:
build-and-test:
strategy:
fail-fast: false
matrix:
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]]
matrix:
os:
[
[self-hosted, macos, amd64, 13, test],
[self-hosted, macos, amd64, 14, test],
[self-hosted, macos, arm64, 13, test],
[self-hosted, macos, arm64, 14, test],
]
runs-on: ${{ matrix.os }}
steps:
# Cleanup
# Cleanup
- name: Cleanup Workspace
run: |
sudo rm -rf *
Expand All @@ -28,7 +34,7 @@ jobs:
if pgrep '^socket_vmnet'; then
sudo pkill '^socket_vmnet'
fi

- name: Checkout AWS CDK main branch
uses: actions/checkout@v4
with:
Expand All @@ -38,7 +44,7 @@ jobs:
- name: Configure Node.js version
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: "18"

- name: Install dependencies
run: |
Expand All @@ -47,10 +53,10 @@ jobs:

# Setting Node options and running lerna build
- name: Build with lerna
run: |
run: |
npx lerna run build
npm install -g @aws-cdk/integ-tests
npm install -g @aws-cdk/core
npm install -g @aws-cdk/core
env:
NODE_OPTIONS: "--max-old-space-size=8192"

Expand All @@ -60,9 +66,9 @@ jobs:
repository: runfinch/finch
ref: main
path: finch-temp
submodules: 'recursive'
submodules: "recursive"

# Setup Go using version specified in go.mod
# Setup Go using version specified in go.mod
- name: Setup Go from Finch's go.mod
uses: actions/setup-go@v5
with:
Expand All @@ -87,7 +93,7 @@ jobs:
- name: Run integration tests
uses: nick-fields/retry@v2
with:
timeout_minutes: 180
max_attempts: 3
# Drop in replacement for docker in CDK https://github.com/aws/aws-cdk/blob/b23252b99559ad1a1f0e05b6936c60f9c52522ff/packages/cdk-assets/README.md?plain=1#L185
command: CDK_DOCKER=finch yarn integ-runner --max-workers=1 --directory packages/@aws-cdk-testing/framework-integ
timeout_minutes: 180
max_attempts: 3
# Drop in replacement for docker in CDK https://github.com/aws/aws-cdk/blob/b23252b99559ad1a1f0e05b6936c60f9c52522ff/packages/cdk-assets/README.md?plain=1#L185
command: CDK_DOCKER=finch yarn integ-runner --max-workers=1 --directory packages/@aws-cdk-testing/framework-integ
18 changes: 12 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on:
branches:
- main
paths-ignore:
- '**.md'
- 'src/**'
- "**.md"
- "src/**"
pull_request:
branches:
- main
paths-ignore:
- '**.md'
- 'contrib/**'
- 'Dockerfile'
- "**.md"
- "contrib/**"
- "Dockerfile"
workflow_dispatch:

concurrency:
Expand All @@ -24,7 +24,13 @@ jobs:
strategy:
fail-fast: false
matrix:
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]]
os:
[
[self-hosted, macos, amd64, 13, test],
[self-hosted, macos, amd64, 14, test],
[self-hosted, macos, arm64, 13, test],
[self-hosted, macos, arm64, 14, test],
]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
Expand Down
Loading