Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into v6
Browse files Browse the repository at this point in the history
  • Loading branch information
iwahbe committed Aug 4, 2023
2 parents e17996a + 42b0a0a commit 4ec5548
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 13 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/artifact-cleanup.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
with:
name: ${{ matrix.language }}-sdk.tar.gz
path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down Expand Up @@ -241,6 +242,7 @@ jobs:
with:
name: ${{ env.PROVIDER }}-provider.tar.gz
path: ${{ github.workspace }}/bin/provider.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ jobs:
with:
name: ${{ matrix.language }}-sdk.tar.gz
path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down Expand Up @@ -170,6 +171,17 @@ jobs:
uses: jaxxstorm/[email protected]
with:
repo: mikhailshilkov/schema-tools
- name: Clear GitHub Actions Ubuntu runner disk space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: false
dotnet: false
android: true
haskell: true
swap-storage: true
# TODO: enable once transient error with azure is resolved
# E: Failed to fetch http://azure.archive.ubuntu.com/ubuntu/pool/universe/d/dotnet7/aspnetcore-targeting-pack-7.0_7.0.105-0ubuntu1%7e22.04.1_amd64.deb 404 Not Found [IP: 40.81.13.82 80]
large-packages: false
- name: Echo Coverage Output Dir
run: 'echo "Coverage output directory: ${{ env.COVERAGE_OUTPUT_DIR }}"'
- name: Generate Coverage Data
Expand Down Expand Up @@ -264,6 +276,7 @@ jobs:
with:
name: ${{ env.PROVIDER }}-provider.tar.gz
path: ${{ github.workspace }}/bin/provider.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
with:
name: ${{ matrix.language }}-sdk.tar.gz
path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down Expand Up @@ -198,6 +199,7 @@ jobs:
with:
name: ${{ env.PROVIDER }}-provider.tar.gz
path: ${{ github.workspace }}/bin/provider.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ jobs:
with:
name: ${{ matrix.language }}-sdk.tar.gz
path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down Expand Up @@ -231,6 +232,7 @@ jobs:
with:
name: ${{ env.PROVIDER }}-provider.tar.gz
path: ${{ github.workspace }}/bin/provider.tar.gz
retention-days: 30
- if: failure() && github.event_name == 'push'
name: Notify Slack
uses: 8398a7/action-slack@v3
Expand Down
8 changes: 8 additions & 0 deletions provider/cmd/pulumi-resource-aws/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -74085,6 +74085,10 @@
"name": "Ruby2d7",
"value": "ruby2.7"
},
{
"name": "Ruby3d2",
"value": "ruby3.2"
},
{
"name": "NodeJS10dX",
"value": "nodejs10.x",
Expand Down Expand Up @@ -74132,6 +74136,10 @@
"name": "Python3d10",
"value": "python3.10"
},
{
"name": "Python3d11",
"value": "python3.11"
},
{
"name": "Custom",
"value": "provided"
Expand Down
2 changes: 2 additions & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -5712,6 +5712,7 @@ func Provider() *tfbridge.ProviderInfo {
{Value: "java11", Name: "Java11"},
{Value: "ruby2.5", Name: "Ruby2d5", DeprecationMessage: "This runtime is now deprecated"},
{Value: "ruby2.7", Name: "Ruby2d7"},
{Value: "ruby3.2", Name: "Ruby3d2"},
{Value: "nodejs10.x", Name: "NodeJS10dX", DeprecationMessage: "This runtime is now deprecated"},
{Value: "nodejs12.x", Name: "NodeJS12dX"},
{Value: "nodejs14.x", Name: "NodeJS14dX"},
Expand All @@ -5723,6 +5724,7 @@ func Provider() *tfbridge.ProviderInfo {
{Value: "python3.8", Name: "Python3d8"},
{Value: "python3.9", Name: "Python3d9"},
{Value: "python3.10", Name: "Python3d10"},
{Value: "python3.11", Name: "Python3d11"},
{Value: "provided", Name: "Custom"},
{Value: "provided.al2", Name: "CustomAL2"},
},
Expand Down
2 changes: 2 additions & 0 deletions sdk/dotnet/Lambda/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ private Runtime(string value)
[Obsolete(@"This runtime is now deprecated")]
public static Runtime Ruby2d5 { get; } = new Runtime("ruby2.5");
public static Runtime Ruby2d7 { get; } = new Runtime("ruby2.7");
public static Runtime Ruby3d2 { get; } = new Runtime("ruby3.2");
[Obsolete(@"This runtime is now deprecated")]
public static Runtime NodeJS10dX { get; } = new Runtime("nodejs10.x");
public static Runtime NodeJS12dX { get; } = new Runtime("nodejs12.x");
Expand All @@ -46,6 +47,7 @@ private Runtime(string value)
public static Runtime Python3d8 { get; } = new Runtime("python3.8");
public static Runtime Python3d9 { get; } = new Runtime("python3.9");
public static Runtime Python3d10 { get; } = new Runtime("python3.10");
public static Runtime Python3d11 { get; } = new Runtime("python3.11");
public static Runtime Custom { get; } = new Runtime("provided");
public static Runtime CustomAL2 { get; } = new Runtime("provided.al2");

Expand Down
2 changes: 2 additions & 0 deletions sdk/go/aws/lambda/pulumiEnums.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public enum Runtime {
@Deprecated /* This runtime is now deprecated */
Ruby2d5("ruby2.5"),
Ruby2d7("ruby2.7"),
Ruby3d2("ruby3.2"),
/**
* @deprecated
* This runtime is now deprecated
Expand All @@ -60,6 +61,7 @@ public enum Runtime {
Python3d8("python3.8"),
Python3d9("python3.9"),
Python3d10("python3.10"),
Python3d11("python3.11"),
Custom("provided"),
CustomAL2("provided.al2");

Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/types/enums/lambda/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const Runtime = {
*/
Ruby2d5: "ruby2.5",
Ruby2d7: "ruby2.7",
Ruby3d2: "ruby3.2",
/**
* @deprecated This runtime is now deprecated
*/
Expand All @@ -39,6 +40,7 @@ export const Runtime = {
Python3d8: "python3.8",
Python3d9: "python3.9",
Python3d10: "python3.10",
Python3d11: "python3.11",
Custom: "provided",
CustomAL2: "provided.al2",
} as const;
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_aws/lambda_/_enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Runtime(str, Enum):
JAVA11 = "java11"
RUBY2D5 = "ruby2.5"
RUBY2D7 = "ruby2.7"
RUBY3D2 = "ruby3.2"
NODE_JS10D_X = "nodejs10.x"
NODE_JS12D_X = "nodejs12.x"
NODE_JS14D_X = "nodejs14.x"
Expand All @@ -34,5 +35,6 @@ class Runtime(str, Enum):
PYTHON3D8 = "python3.8"
PYTHON3D9 = "python3.9"
PYTHON3D10 = "python3.10"
PYTHON3D11 = "python3.11"
CUSTOM = "provided"
CUSTOM_AL2 = "provided.al2"

0 comments on commit 4ec5548

Please sign in to comment.