Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
eb1a6ea
Create DoctorUpgrade.yml
TheRealAmazonKendra Feb 16, 2023
75cfcaf
Update DoctorUpgrade.yml
TheRealAmazonKendra Feb 16, 2023
4dfa335
Update DoctorUpgrade.yml
TheRealAmazonKendra Feb 16, 2023
420d16e
Update DoctorUpgrade.yml
TheRealAmazonKendra Feb 16, 2023
0242049
Update DoctorUpgrade.yml
TheRealAmazonKendra Feb 17, 2023
ad49f68
Update DoctorUpgrade.yml
TheRealAmazonKendra Feb 17, 2023
c29721b
Merge pull request #491 from aws/main
TheRealAmazonKendra Feb 18, 2023
4e6b508
Merge branch 'aws:main' into main
TheRealAmazonKendra Aug 1, 2023
2364b61
Update buildspec-pr.yaml
TheRealAmazonKendra Aug 1, 2023
e5776cc
Update buildspec-pr.yaml
TheRealAmazonKendra Aug 1, 2023
9b4ef7d
Update check-build-prerequisites.sh
TheRealAmazonKendra Aug 1, 2023
5c98087
Update buildspec-pr.yaml
TheRealAmazonKendra Aug 1, 2023
5bc39dd
Update check-build-prerequisites.sh
TheRealAmazonKendra Aug 1, 2023
24cf36e
Update buildspec.yaml
TheRealAmazonKendra Aug 1, 2023
63afed8
Merge branch 'aws:main' into main
TheRealAmazonKendra Oct 4, 2023
5a11853
Create build
TheRealAmazonKendra Oct 4, 2023
2773ec5
Delete .github/workflows/build
TheRealAmazonKendra Oct 4, 2023
07d5673
Create build.yml
TheRealAmazonKendra Oct 4, 2023
7cf93c9
Update build.yml
TheRealAmazonKendra Oct 4, 2023
a2db486
Update build.yml
TheRealAmazonKendra Oct 4, 2023
1796c5a
Update build.yml
TheRealAmazonKendra Oct 9, 2023
80485f9
Update build.yml
TheRealAmazonKendra Oct 9, 2023
b9f0184
chore(deps): Bump tj-actions/changed-files from 39.2.0 to 40.0.0
dependabot[bot] Oct 30, 2023
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
29 changes: 29 additions & 0 deletions .github/workflows/DoctorUpgrade.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Doctor Update

on:
workflow_dispatch: {}

jobs:
upgrade:
name: Doctor Upgrade
permissions:
contents: read
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 14

- name: Tools Install
run: |-
npm -g install npm-check-updates
- name: Upgrade Dependencies
run: |-
ncu --upgrade --workspaces --doctor --doctorTest="yarn build" --verbose
env:
CDK_INTEG_ACCOUNT: 123456789012
CDK_INTEG_REGION: us-west-2
27 changes: 27 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: build
on:
workflow_dispatch: {}
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: write
env:
CI: "true"
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: Install dependencies
run: npm -g install yarn lerna
- run: |-
ls
pwd
- name: Build
run: yarn build
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
uses: tj-actions/changed-files@af292f1e845a0377b596972698a8598734eb2796
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
10 changes: 2 additions & 8 deletions buildspec-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@ env:
phases:
install:
commands:

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# CodeBuild always runs as root, allow npm to operate as such
- npm config set unsafe-perm true

# Install yarn if it wasn't already present in the image
- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay2 &
- timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
- yarn --version || npm -g install yarn

# Packing aws-cdk-lib can cause memory errors. Increasing this value
Expand Down
7 changes: 0 additions & 7 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ phases:
install:
commands:

# baked in our image.
# this also takes care of launching the docker daemon.
- /root/ecr-proxy/start.sh

# CodeBuild always runs as root, allow npm to operate as such
- npm config set unsafe-perm true

# Install yarn if it wasn't already present in the image
- yarn --version || npm -g install yarn

Expand Down
94 changes: 47 additions & 47 deletions scripts/check-build-prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,53 @@ else
wrong_version
fi

# Container Client
container_client=${CDK_DOCKER:-docker}
docker_min="19.03.0"
finch_min="0.3.0"

# [Docker >= 19.03]
if [ "$container_client" == "docker" ]; then
check_which $container_client $docker_min

# Make sure docker is running
echo -e "Checking if Docker is running... \c"
docker_running=$(docker ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "Docker is not running"
fi

# [finch >= 0.3.0]
elif [ "$container_client" == "finch" ]; then
check_which $container_client $finch_min

# Make sure docker is running
echo -e "Checking if finch is running... \c"
finch_running=$($container_client ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "Finch is not running"
fi
else
echo "⚠️ Dependency warning: Unknown container client detected. You have set \"CDK_DOCKER=$CDK_DOCKER\"."
check_which $container_client "(unknown version requirement)"
echo "While any docker compatible client can be used as a drop-in replacement, support for \"$CDK_DOCKER\" is unknown."
echo "Proceed with caution."
echo -e "Checking if $container_client is running... \c"
client_running=$($container_client ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "$CDK_DOCKER is not running"
fi
fi

# [Yarn >= 1.19.1, < 1.30]
app="yarn"
app_min="1.19.1"
Expand All @@ -74,53 +121,6 @@ else
wrong_version
fi

# Container Client
container_client=${CDK_DOCKER:-docker}
docker_min="19.03.0"
finch_min="0.3.0"

# [Docker >= 19.03]
if [ "$container_client" == "docker" ]; then
check_which $container_client $docker_min

# Make sure docker is running
echo -e "Checking if Docker is running... \c"
docker_running=$(docker ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "Docker is not running"
fi

# [finch >= 0.3.0]
elif [ "$container_client" == "finch" ]; then
check_which $container_client $finch_min

# Make sure docker is running
echo -e "Checking if finch is running... \c"
finch_running=$($container_client ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "Finch is not running"
fi
else
echo "⚠️ Dependency warning: Unknown container client detected. You have set \"CDK_DOCKER=$CDK_DOCKER\"."
check_which $container_client "(unknown version requirement)"
echo "While any docker compatible client can be used as a drop-in replacement, support for \"$CDK_DOCKER\" is unknown."
echo "Proceed with caution."
echo -e "Checking if $container_client is running... \c"
client_running=$($container_client ps)
if [ $? -eq 0 ]
then
echo "Ok"
else
die "$CDK_DOCKER is not running"
fi
fi

# [.NET == 6.0.x]
app="dotnet"
app_min="6.0.100"
Expand Down