From 98c1f3a45c1f8900e24a22ab527515159b1a7c89 Mon Sep 17 00:00:00 2001 From: Jared Deiner Date: Fri, 24 May 2024 14:02:35 -0700 Subject: [PATCH 1/5] Runtime(v1.0.6) + Tooling(v1.0.4) version bump --- package.json | 2 +- python/rpdk/typescript/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0135ab5..4248584 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@amazon-web-services-cloudformation/cloudformation-cli-typescript-lib", - "version": "1.0.5", + "version": "1.0.6", "description": "The CloudFormation Resource Provider Development Kit (RPDK) allows you to author your own resource providers that can be used by CloudFormation. This plugin library helps to provide runtime bindings for the execution of your providers by CloudFormation.", "private": false, "main": "dist/index.js", diff --git a/python/rpdk/typescript/__init__.py b/python/rpdk/typescript/__init__.py index c136502..affdd60 100644 --- a/python/rpdk/typescript/__init__.py +++ b/python/rpdk/typescript/__init__.py @@ -1,5 +1,5 @@ import logging -__version__ = "1.0.3" +__version__ = "1.0.4" logging.getLogger(__name__).addHandler(logging.NullHandler()) From 38048e0b08bb110164a1d058d5bae3f9854b0098 Mon Sep 17 00:00:00 2001 From: Jared Deiner Date: Fri, 31 May 2024 10:30:06 -0700 Subject: [PATCH 2/5] Update ci workflow to install Docker with --cask option for Mac OSX --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 826a4aa..7a94263 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: id: install_mac_docker if: runner.os == 'macOS' run: | - brew install docker + brew install docker --cask # Docker engine is no longer available because of licensing # Alternative Colima is part of the github macOS runner # SAM v1.47.0+ needed for colima support, unable to use Python 3.6 From c6cde48523a0941498ebf5fa39e2fa2a33144150 Mon Sep 17 00:00:00 2001 From: Jared Deiner Date: Fri, 31 May 2024 10:34:52 -0700 Subject: [PATCH 3/5] Update ci workflow to install colima for Mac OSX --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a94263..661cbc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: if: runner.os == 'macOS' run: | brew install docker --cask + brew install colima # Docker engine is no longer available because of licensing # Alternative Colima is part of the github macOS runner # SAM v1.47.0+ needed for colima support, unable to use Python 3.6 From 786b1cd759760db9c5a2d232097f9c71121a4cca Mon Sep 17 00:00:00 2001 From: Jared Deiner Date: Fri, 31 May 2024 11:04:38 -0700 Subject: [PATCH 4/5] Downgrade the macOS version used for Docker tests to macos-13 to fix recent Docker build failures --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 661cbc4..d332dd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + os: + - ubuntu-latest + - macos-13 # Later versions of ARM-based macOS runners fail because the hypervisor framework required for Docker is not supported python: [ "3.8", "3.9", "3.10", "3.11"] node: [ 20 ] env: From 1417b45b4240b1467a1bb2676f417dd2f71cecd2 Mon Sep 17 00:00:00 2001 From: Jared Deiner Date: Fri, 31 May 2024 11:20:29 -0700 Subject: [PATCH 5/5] Downgrade the macOS version used for Docker tests to macos-12 to fix recent Docker build failures --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d332dd1..7c36fd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-13 # Later versions of ARM-based macOS runners fail because the hypervisor framework required for Docker is not supported + - macos-12 # Later versions of ARM-based macOS runners fail because the hypervisor framework required for Docker is not supported python: [ "3.8", "3.9", "3.10", "3.11"] node: [ 20 ] env: