Skip to content

Commit f1ff514

Browse files
authored
2 parents b380f01 + d1b36ff commit f1ff514

File tree

20 files changed

+52
-35
lines changed

20 files changed

+52
-35
lines changed

.github/workflows/docker-images.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,15 @@ jobs:
143143
run: |-
144144
echo "value=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
145145
146+
- name: Show Available Disk Space
147+
run: df -h && du -h
148+
- name: Free Disk Space
149+
uses: jlumbroso/[email protected]
146150
- name: Build Image
147151
if: steps.should-run.outputs.result == 'true'
148152
run: |-
149153
docker buildx build \
154+
--quiet \
150155
--builder ${{ steps.buildx.outputs.name }} \
151156
--platform linux/amd64,linux/arm64 \
152157
--target superchain \
@@ -226,7 +231,7 @@ jobs:
226231
227232
- name: Update README (nightly)
228233
if: steps.should-run.outputs.result == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
229-
uses: peter-evans/dockerhub-description@v3
234+
uses: peter-evans/dockerhub-description@v4
230235
with:
231236
username: ${{ steps.credentials.outputs.username }}
232237
password: ${{ steps.credentials.outputs.password }}

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install python3-venv
5656
run: sudo apt install -y python3-venv
5757
- name: Cache
58-
uses: actions/cache@v3
58+
uses: actions/cache@v4
5959
with:
6060
path: |-
6161
~/.m2/repository
@@ -138,7 +138,7 @@ jobs:
138138
- name: Install python3-venv
139139
run: sudo apt install -y python3-venv
140140
- name: Cache
141-
uses: actions/cache@v3
141+
uses: actions/cache@v4
142142
with:
143143
path: |-
144144
~/.m2/repository
@@ -328,7 +328,7 @@ jobs:
328328
if: runner.os == 'Linux'
329329
run: sudo apt install -y python3-venv
330330
- name: Cache
331-
uses: actions/cache@v3
331+
uses: actions/cache@v4
332332
with:
333333
path: |-
334334
~/.m2/repository

.github/workflows/yarn-upgrade.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp }}/upgrade.patch || echo "Empty patch. Skipping."'
131131

132132
- name: Make Pull Request
133-
uses: peter-evans/create-pull-request@v5
133+
uses: peter-evans/create-pull-request@v6
134134
with:
135135
# Git commit details
136136
author: 'AWS CDK Automation <[email protected]>'

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [1.95.0](https://github.com/aws/jsii/compare/v1.94.0...v1.95.0) (2024-02-14)
6+
7+
8+
### Bug Fixes
9+
10+
* **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))
11+
512
## [1.94.0](https://github.com/aws/jsii/compare/v1.93.0...v1.94.0) (2024-01-09)
613

714

gh-pages/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
mkdocs~=1.5.3
22
mkdocs-awesome-pages-plugin~=2.9.2
3-
mkdocs-material~=9.5.3
3+
mkdocs-material~=9.5.9
44
mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"rejectCycles": true
1313
}
1414
},
15-
"version": "1.94.0",
15+
"version": "1.95.0",
1616
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1717
}

packages/@jsii/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
1111
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
1212

13-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1414
<PackageReference Update="NSubstitute" Version="5.1.0" />
15-
<PackageReference Update="xunit" Version="2.6.1" />
15+
<PackageReference Update="xunit" Version="2.6.6" />
1616
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6" />
1717
<PackageReference Update="XunitXml.TestLogger" Version="3.1.17" />
1818

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/FrameworkToJsiiConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public sealed class Primitive : TestBase
100100
[InlineData(PrimitiveType.String, "a", "a", true)]
101101
[InlineData(PrimitiveType.String, "abc", "abc", true)]
102102
[InlineData(PrimitiveType.String, null, null, true)]
103-
public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, object expected, bool isOptional)
103+
public void ConvertsPrimitiveValues(PrimitiveType primitive, object? value, object? expected, bool isOptional)
104104
{
105105
var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional);
106106

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/JsiiToFrameworkConverterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public sealed class Primitive : TestBase
9797
[InlineData(PrimitiveType.String, "a", "a", true)]
9898
[InlineData(PrimitiveType.String, "abc", "abc", true)]
9999
[InlineData(PrimitiveType.String, null, null, true)]
100-
public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, object expected, bool isOptional)
100+
public void ConvertsPrimitiveValues(PrimitiveType primitive, object? value, object? expected, bool isOptional)
101101
{
102102
var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional);
103103

packages/@jsii/go-runtime-test/project/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
1010
github.com/stretchr/testify v1.8.4
1111
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
12-
golang.org/x/tools v0.16.1
12+
golang.org/x/tools v0.18.0
1313
)
1414

1515
require (
@@ -21,8 +21,8 @@ require (
2121
github.com/mattn/go-isatty v0.0.20 // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/yuin/goldmark v1.4.13 // indirect
24-
golang.org/x/mod v0.14.0 // indirect
25-
golang.org/x/sys v0.14.0 // indirect
24+
golang.org/x/mod v0.15.0 // indirect
25+
golang.org/x/sys v0.17.0 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)
2828

packages/@jsii/go-runtime-test/project/go.sum

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,26 @@ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPI
2222
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
2323
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
2424
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
25+
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
26+
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2527
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2628
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2729
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
28-
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
30+
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
2931
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3032
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3133
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3234
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3335
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
3436
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
37+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
38+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3539
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3640
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
37-
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
38-
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
41+
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
42+
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
43+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
44+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
3945
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4046
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4147
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

packages/@jsii/go-runtime/jsii-runtime-go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/mattn/go-isatty v0.0.20
99
github.com/stretchr/testify v1.8.4
1010
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
11-
golang.org/x/tools v0.16.1
11+
golang.org/x/tools v0.17.0
1212
)
1313

1414
require (

packages/@jsii/go-runtime/jsii-runtime-go/go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2525
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2626
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2727
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
28-
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
28+
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
2929
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3030
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3131
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -34,8 +34,8 @@ golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
3434
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3535
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3636
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
37-
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
38-
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
37+
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
38+
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
3939
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4040
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

packages/@jsii/go-runtime/jsii-runtime-go/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func Numbers[T numberType](v ...T) *[]*float64 {
5454
// String returns a pointer to the provided string.
5555
func String(v string) *string { return Ptr(v) }
5656

57-
// Sprintf returns a pointer to a fomratted string (semantics are the same as fmt.Sprintf).
57+
// Sprintf returns a pointer to a formatted string (semantics are the same as fmt.Sprintf).
5858
func Sprintf(format string, a ...interface{}) *string {
5959
res := fmt.Sprintf(format, a...)
6060
return &res

packages/@jsii/go-runtime/jsii-runtime-go/jsii.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "github.com/aws/jsii-runtime-go/internal/kernel"
44

55
// Close finalizes the runtime process, signalling the end of the execution to
66
// the jsii kernel process, and waiting for graceful termination. The best
7-
// practice is to defer call thins at the beginning of the "main" function.
7+
// practice is to defer call this at the beginning of the "main" function.
88
func Close() {
99
kernel.CloseClient()
1010
}

packages/@jsii/python-runtime/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
black~=23.12
22
mypy==1.8.0
3-
pip~=23.3
4-
pytest~=7.4
3+
pip~=24.0
4+
pytest~=8.0
55
pytest-mypy~=0.10
6-
setuptools~=69.0.3
6+
setuptools~=69.1.0
77
types-python-dateutil~=2.8
88
wheel~=0.42
99

packages/jsii-pacmak/lib/index.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ export async function pacmak({
7474
await updateAllNpmIgnores(modulesToPackageFlat);
7575
}
7676

77-
await timers.recordAsync('npm pack', () => {
77+
const packCommand = argv['pack-command'];
78+
await timers.recordAsync(packCommand, () => {
7879
logging.info('Packaging NPM bundles');
79-
return Promise.all(
80-
modulesToPackageFlat.map((m) => m.npmPack(argv['pack-command'])),
81-
);
80+
return Promise.all(modulesToPackageFlat.map((m) => m.npmPack(packCommand)));
8281
});
8382

8483
await timers.recordAsync('load jsii', () => {

packages/jsii-pacmak/lib/targets/python/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
setuptools~=67.3.2 # build-system
77
wheel~=0.42 # build-system
88

9-
twine~=4.0.2
9+
twine~=5.0.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
mypy==1.8.0
2-
pip==23.3.2 # required to use --config-settings
2+
pip==24.0 # required to use --config-settings

yarn.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)