Skip to content

Commit 4f930f6

Browse files
authoredNov 15, 2024
chore: remove EOS packages jsii and jsii-rosetta (#4701)
Delete the 1.x version line of these packages. Please use [aws/jsii-compiler](https://github.com/aws/jsii-compiler) and [aws/jsii-rosetta](https://github.com/aws/jsii-rosetta) respectively. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
1 parent 1892a7e commit 4f930f6

File tree

719 files changed

+447
-40393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

719 files changed

+447
-40393
lines changed
 

‎.github/workflows/main.yml

Lines changed: 6 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -376,67 +376,14 @@ jobs:
376376
# This is just a join target to simplify branch protection setup
377377
run: echo OK
378378

379-
benchmark:
380-
name: Run benchmark suite
381-
runs-on: ubuntu-latest
382-
permissions:
383-
contents: read
384-
pull-requests: write
385-
needs: build
386-
steps:
387-
# Check out the code
388-
- name: Download Artifact
389-
uses: actions/download-artifact@v3
390-
with:
391-
name: built-tree
392-
- name: Extract Artifact
393-
run: |-
394-
echo "::group::Untar Archive"
395-
tar zxvf built-tree.tgz
396-
echo "::endgroup"
397-
398-
rm built-tree.tgz
399-
- name: Set up Node
400-
uses: actions/setup-node@v4
401-
with:
402-
cache: yarn
403-
node-version: 'lts/*'
404-
- name: Install Dependencies
405-
run: yarn install --frozen-lockfile
406-
- name: Run Benchmark
407-
working-directory: packages/@jsii/benchmarks
408-
run: yarn bench --output ${{ runner.temp }}/bench-output.json
409-
- name: Compare Benchmark Results
410-
if: github.event_name == 'pull_request'
411-
uses: benchmark-action/github-action-benchmark@v1
412-
with:
413-
name: jsii Benchmark Regression
414-
tool: 'customSmallerIsBetter'
415-
output-file-path: ${{ runner.temp }}/bench-output.json
416-
comment-always: true
417-
github-token: ${{ secrets.GITHUB_TOKEN }}
418-
fail-on-alert: true
419-
- name: Upload Benchmark Results
420-
if: github.event_name == 'push'
421-
uses: benchmark-action/github-action-benchmark@v1
422-
with:
423-
name: jsii Benchmark
424-
tool: 'customSmallerIsBetter'
425-
output-file-path: ${{ runner.temp }}/bench-output.json
426-
github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
427-
auto-push: true
428-
429379
pacmak-integration-test:
430380
runs-on: ubuntu-latest
431381
needs: create-release-package
432382
strategy:
433383
fail-fast: false
434384
matrix:
435385
rosetta:
436-
# this will be the 1.x-dev version build in this repo
437-
- ./jsii-rosetta.tgz
438-
- 5.2.x
439-
- 5.3.x
386+
- latest
440387
- 5.4.x
441388
- 5.5.x
442389
- 5.6.x
@@ -473,15 +420,11 @@ jobs:
473420
run: sudo apt install -y python3-venv
474421
# Show time!
475422
- name: Prepare Work Tree
476-
# 1) Move the locally build version of jsii-rosetta somewhere else
477-
# 2) Remove @jsii/integ-test because it messed up version dependencies and is not needed
478-
# 3) Install aws-cdk-lib, and all locally build packages minus jsii-rosetta & @jsii/integ-test,
479-
# and the specific version of jsii-rosetta
480-
# This ensures we are running jsii-pacmak with the correct peer-dependency
481-
# 4) Print the jsii-rosetta version for confirmation
423+
# 1) Install aws-cdk-lib,
424+
# all locally build packages,
425+
# the specific version of jsii-rosetta.
426+
# 2) Print the jsii-rosetta version for confirmation
482427
run: |-
483-
mv ${{ runner.temp }}/release-package/js/jsii-rosetta.tgz ./jsii-rosetta.tgz
484-
rm ${{ runner.temp }}/release-package/private/@jsii-integ-test.tgz
485428
npm install --no-save --omit=dev \
486429
aws-cdk-lib@2 \
487430
constructs@10 \
@@ -498,7 +441,7 @@ jobs:
498441
./node_modules/.bin/jsii-pacmak --no-parallel ./node_modules/aws-cdk-lib
499442
# Upload artifact only on main and for latest rosetta
500443
- name: 'Upload Artifact: integtest_aws-cdk-lib'
501-
if: github.ref == 'ref/head/main' && matrix.rosetta == '5.4.x'
444+
if: github.ref == 'ref/head/main' && matrix.rosetta == 'latest'
502445
uses: actions/upload-artifact@v4
503446
with:
504447
name: integtest_aws-cdk-lib

‎CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Each one of these scripts can be executed either from the root of the repo using
9999
Troubleshooting bugs usually starts with adding a new test that demonstrates the
100100
faulty behavior, then modifying implementations until the test passes.
101101

102-
The `jsii-calc` and `@scope/*` packages are used to test expected brhavior from
102+
The `jsii-calc` and `@scope/*` packages are used to test expected behavior from
103103
the compiler (note that the [aws/jsii-compiler](github.com/aws/jsii-compiler)
104104
repository as a separate copy of these under the `fixtures` directory), as well
105105
as downstream tooling (`jsii-pacmak`, `jsii-rosetta`, etc...). Each language
@@ -276,3 +276,4 @@ To ensure compatibility, we also have integration tests.
276276

277277
1. Add the new version to the `jsii-rosetta` peer dependency in [package.json](./packages/jsii-pacmak/package.json)
278278
2. Add the new version to the `pacmak-integration-test` matrix in the main build workflow in [main.yml](.github/workflows/main.yml)
279+
3. Remove any versions for which support has ended (EOS) from both locations

0 commit comments

Comments
 (0)