Skip to content

Commit

Permalink
Merge branch 'main' into mrgrain/ci/matrix-results-are-not-actually-c…
Browse files Browse the repository at this point in the history
…hecked
  • Loading branch information
mrgrain authored Nov 27, 2024
2 parents 3f19644 + 64e0d83 commit 69896eb
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 1,416 deletions.
27 changes: 10 additions & 17 deletions .devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{
"name": "Dev Container - aws/jsii",
"build": {
"dockerfile": "superchain/Dockerfile",
"context": ".",
"target": "superchain",
"args": {
"BUILD_TIMESTAMP": "unknown",
"COMMIT_ID": "HEAD",
"REGISTRY": "docker.io/library",
},
},
"containerUser": "superchain",
"remoteUser": "superchain",
"postCreateCommand": "yarn install && yarn build",
"extensions": [
"dbaeumer.vscode-eslint@2.1.5",
],
"name": "Dev Container - aws/jsii",
"image": "public.ecr.aws/jsii/superchain:1-bookworm-slim",
"containerUser": "superchain",
"remoteUser": "superchain",
"postCreateCommand": "yarn install",
"customizations": {
"vscode": {
"extensions": ["dbaeumer.vscode-eslint", "Orta.vscode-jest"]
}
}
}
287 changes: 0 additions & 287 deletions .github/workflows/docker-images.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
queue_rules:
- name: default-squash
conditions:
- status-success~=^jsii/superchain
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)
commit_message_template: |-
Expand All @@ -13,7 +12,6 @@ queue_rules:

- name: default-merge
conditions:
- status-success~=^jsii/superchain
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)
commit_message_template: |-
Expand Down Expand Up @@ -49,8 +47,6 @@ pull_request_rules:
- '#review-requested=0'
- '#changes-requested-reviews-by=0'
- status-success=Validate PR Title
# Docker image validation
- status-success~=^Done$
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)

Expand All @@ -76,8 +72,6 @@ pull_request_rules:
- '#review-requested=0'
- '#changes-requested-reviews-by=0'
- status-success=Validate PR Title
# Docker image validation
- status-success~=^jsii/superchain
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)

Expand All @@ -103,8 +97,6 @@ pull_request_rules:
- '#review-requested=0'
- '#changes-requested-reviews-by=0'
- status-success=Validate PR Title
# Docker image validation
- status-success~=^jsii/superchain
- status-success=Unit Tests
- status-success=Integration test (jsii-pacmak)

Expand Down
20 changes: 2 additions & 18 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,9 @@ will need a number of tools.
We have built a Docker image with all the required tools, which we are using for
our own CI/CD: the ["superchain" image][superchain] from.

[superchain]: https://github.com/aws/jsii/blob/main/superchain/Dockerfile
[superchain]: https://github.com/aws/jsii-superchain

The image can be built for local usage, too:

```console
IMAGE=superchain
docker build -t ${IMAGE} -f superchain/Dockerfile .
```

In order to get an interactive shell within a Docker container using the
*superchain* image you just built:

```console
cd jsii # go to the root of the jsii repo
docker run --rm --net=host -it -v $PWD:$PWD -w $PWD ${IMAGE}
```

In the shell that pops up, the `npm run` commands in the following sections must
be executed.
Please see the superchain repo for usage instructions.

### Alternative: Manually install the toolchain

Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/specification/5-new-language-intake.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ on this to build artifacts for any of the supported languages.
In addition to this, standardized _Amazon CodePipeline_ actions need to be developed in order to support publishing to
the relevant idiomatic package managers.

[`public.ecr.aws/jsii/superchain`]: https://github.com/aws/jsii/tree/main/superchain
[`public.ecr.aws/jsii/superchain`]: https://github.com/aws/jsii-superchain

## Compliance Tests

Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/user-guides/language-support/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ declared _Generally Available_. At this point, breaking changes are no longer po
[`jsii-pacmak`]: ../../packages/jsii-pacmak
[`jsii-rosetta`]: https://github.com/aws/jsii-rosetta
[standard compliance suite]: ../../specification/4-standard-compliance-suite.md
[`public.ecr.aws/jsii/superchain`]: ../../superchain
[`public.ecr.aws/jsii/superchain`]: https://github.com/aws/jsii-superchain
[`aws-delivlib`]: https://github.com/awslabs/aws-delivlib
[aws cdk]: https://github.com/aws/aws-cdk
[semantic versioning]: https://semver.org
2 changes: 0 additions & 2 deletions superchain/.dockerignore

This file was deleted.

444 changes: 0 additions & 444 deletions superchain/Dockerfile

This file was deleted.

137 changes: 0 additions & 137 deletions superchain/README.md

This file was deleted.

45 changes: 0 additions & 45 deletions superchain/amazon-ssm-agent.json

This file was deleted.

40 changes: 0 additions & 40 deletions superchain/build-local.sh

This file was deleted.

30 changes: 0 additions & 30 deletions superchain/gpg/corretto.asc

This file was deleted.

Loading

0 comments on commit 69896eb

Please sign in to comment.