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

chore(release): 1.95.0 #4427

Merged
merged 26 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8695e72
chore(merge-back): 1.94.0 (#4397)
mergify[bot] Jan 9, 2024
3c1b4b1
fix(jsii-pacmak): show custom pack-command in timer label (#4392)
gmeligio Jan 9, 2024
a87209d
chore(deps): Bump follow-redirects from 1.15.3 to 1.15.4 (#4398)
dependabot[bot] Jan 11, 2024
880fc2d
chore(docs): fix typo in go helper function Doc Comment (#4381)
PeteXC Jan 11, 2024
0dc115a
chore(deps): Bump xunit from 2.6.1 to 2.6.5 in /packages/@jsii/dotnet…
dependabot[bot] Jan 11, 2024
007bf07
chore(deps): Bump golang.org/x/tools from 0.16.1 to 0.17.0 in /packag…
dependabot[bot] Jan 12, 2024
8491e89
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.3 to ~…
dependabot[bot] Jan 15, 2024
f89345d
chore(deps): Bump xunit from 2.6.5 to 2.6.6 in /packages/@jsii/dotnet…
dependabot[bot] Jan 15, 2024
93ec9d7
chore(deps): Bump golang.org/x/tools from 0.16.1 to 0.17.0 in /packag…
dependabot[bot] Jan 16, 2024
62d2d37
chore(deps): Bump actions/cache from 3 to 4 (#4405)
dependabot[bot] Jan 18, 2024
5348d84
chore(deps): Bump peter-evans/dockerhub-description from 3 to 4 (#4408)
dependabot[bot] Jan 26, 2024
8e1bc8f
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.4 to ~…
dependabot[bot] Jan 29, 2024
ddf8c70
chore(deps): Update pytest requirement from ~=7.4 to ~=8.0 in /packag…
dependabot[bot] Jan 29, 2024
4f70106
chore(deps): Bump peter-evans/create-pull-request from 5 to 6 (#4413)
dependabot[bot] Feb 1, 2024
2b7c7ac
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.6 to ~…
dependabot[bot] Feb 5, 2024
6e7e501
chore(deps): Update pip requirement from ~=23.3 to ~=24.0 in /package…
dependabot[bot] Feb 5, 2024
3551692
chore(deps-dev): Bump pip from 23.3.2 to 24.0 in /packages/jsii-pacma…
dependabot[bot] Feb 5, 2024
41498e8
chore(deps): Update setuptools requirement from ~=69.0.3 to ~=69.1.0 …
dependabot[bot] Feb 12, 2024
d07b8d3
chore(deps-dev): Update twine requirement from ~=4.0.2 to ~=5.0.0 in …
dependabot[bot] Feb 12, 2024
0f41bc3
chore(deps): Bump Microsoft.NET.Test.Sdk from 17.8.0 to 17.9.0 in /pa…
dependabot[bot] Feb 12, 2024
9db40e5
chore(deps-dev): Update mkdocs-material requirement from ~=9.5.7 to ~…
dependabot[bot] Feb 12, 2024
077240b
chore(deps): Bump golang.org/x/tools from 0.17.0 to 0.18.0 in /packag…
dependabot[bot] Feb 13, 2024
e7e650d
chore(release): 1.95.0
Feb 14, 2024
dc768dd
debugging
iliapolo Feb 29, 2024
1979192
build image quietly
iliapolo Feb 29, 2024
d1b36ff
add step to free up disk space
iliapolo Mar 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,15 @@ jobs:
run: |-
echo "value=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT

- name: Show Available Disk Space
run: df -h && du -h
- name: Free Disk Space
uses: jlumbroso/free-disk-space@v1.3.1
- name: Build Image
if: steps.should-run.outputs.result == 'true'
run: |-
docker buildx build \
--quiet \
--builder ${{ steps.buildx.outputs.name }} \
--platform linux/amd64,linux/arm64 \
--target superchain \
Expand Down Expand Up @@ -226,7 +231,7 @@ jobs:

- name: Update README (nightly)
if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: peter-evans/dockerhub-description@v3
uses: peter-evans/dockerhub-description@v4
with:
username: ${{ steps.credentials.outputs.username }}
password: ${{ steps.credentials.outputs.password }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install python3-venv
run: sudo apt install -y python3-venv
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |-
~/.m2/repository
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install python3-venv
run: sudo apt install -y python3-venv
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |-
~/.m2/repository
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
if: runner.os == 'Linux'
run: sudo apt install -y python3-venv
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |-
~/.m2/repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp }}/upgrade.patch || echo "Empty patch. Skipping."'

- name: Make Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
# Git commit details
author: 'AWS CDK Automation <aws-cdk-automation@users.noreply.github.com>'
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.95.0](https://github.com/aws/jsii/compare/v1.94.0...v1.95.0) (2024-02-14)


### Bug Fixes

* **jsii-pacmak:** show custom pack-command in timer label ([#4392](https://github.com/aws/jsii/issues/4392)) ([3c1b4b1](https://github.com/aws/jsii/commit/3c1b4b18055b53703e829b5cf96cf4e799f83cde))

## [1.94.0](https://github.com/aws/jsii/compare/v1.93.0...v1.94.0) (2024-01-09)


Expand Down
2 changes: 1 addition & 1 deletion gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.5.3
mkdocs-awesome-pages-plugin~=2.9.2
mkdocs-material~=9.5.3
mkdocs-material~=9.5.9
mkdocs-git-revision-date-plugin~=0.3.2
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"rejectCycles": true
}
},
"version": "1.94.0",
"version": "1.95.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
4 changes: 2 additions & 2 deletions packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Update="NSubstitute" Version="5.1.0" />
<PackageReference Update="xunit" Version="2.6.1" />
<PackageReference Update="xunit" Version="2.6.6" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public sealed class Primitive : TestBase
[InlineData(PrimitiveType.String, "a", "a", true)]
[InlineData(PrimitiveType.String, "abc", "abc", true)]
[InlineData(PrimitiveType.String, null, null, true)]
public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, object expected, bool isOptional)
public void ConvertsPrimitiveValues(PrimitiveType primitive, object? value, object? expected, bool isOptional)
{
var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public sealed class Primitive : TestBase
[InlineData(PrimitiveType.String, "a", "a", true)]
[InlineData(PrimitiveType.String, "abc", "abc", true)]
[InlineData(PrimitiveType.String, null, null, true)]
public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, object expected, bool isOptional)
public void ConvertsPrimitiveValues(PrimitiveType primitive, object? value, object? expected, bool isOptional)
{
var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional);

Expand Down
6 changes: 3 additions & 3 deletions packages/@jsii/go-runtime-test/project/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
github.com/stretchr/testify v1.8.4
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.16.1
golang.org/x/tools v0.18.0
)

require (
Expand All @@ -21,8 +21,8 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/sys v0.17.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
12 changes: 9 additions & 3 deletions packages/@jsii/go-runtime-test/project/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,26 @@ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPI
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/go-runtime/jsii-runtime-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/mattn/go-isatty v0.0.20
github.com/stretchr/testify v1.8.4
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.16.1
golang.org/x/tools v0.17.0
)

require (
Expand Down
6 changes: 3 additions & 3 deletions packages/@jsii/go-runtime/jsii-runtime-go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
Expand All @@ -34,8 +34,8 @@ golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/go-runtime/jsii-runtime-go/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func Numbers[T numberType](v ...T) *[]*float64 {
// String returns a pointer to the provided string.
func String(v string) *string { return Ptr(v) }

// Sprintf returns a pointer to a fomratted string (semantics are the same as fmt.Sprintf).
// Sprintf returns a pointer to a formatted string (semantics are the same as fmt.Sprintf).
func Sprintf(format string, a ...interface{}) *string {
res := fmt.Sprintf(format, a...)
return &res
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/go-runtime/jsii-runtime-go/jsii.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "github.com/aws/jsii-runtime-go/internal/kernel"

// Close finalizes the runtime process, signalling the end of the execution to
// the jsii kernel process, and waiting for graceful termination. The best
// practice is to defer call thins at the beginning of the "main" function.
// practice is to defer call this at the beginning of the "main" function.
func Close() {
kernel.CloseClient()
}
6 changes: 3 additions & 3 deletions packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
black~=23.12
mypy==1.8.0
pip~=23.3
pytest~=7.4
pip~=24.0
pytest~=8.0
pytest-mypy~=0.10
setuptools~=69.0.3
setuptools~=69.1.0
types-python-dateutil~=2.8
wheel~=0.42

Expand Down
7 changes: 3 additions & 4 deletions packages/jsii-pacmak/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ export async function pacmak({
await updateAllNpmIgnores(modulesToPackageFlat);
}

await timers.recordAsync('npm pack', () => {
const packCommand = argv['pack-command'];
await timers.recordAsync(packCommand, () => {
logging.info('Packaging NPM bundles');
return Promise.all(
modulesToPackageFlat.map((m) => m.npmPack(argv['pack-command'])),
);
return Promise.all(modulesToPackageFlat.map((m) => m.npmPack(packCommand)));
});

await timers.recordAsync('load jsii', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
setuptools~=67.3.2 # build-system
wheel~=0.42 # build-system

twine~=4.0.2
twine~=5.0.0
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy==1.8.0
pip==23.3.2 # required to use --config-settings
pip==24.0 # required to use --config-settings
6 changes: 3 additions & 3 deletions yarn.lock

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