Skip to content

chore: Temporarily use forked jsii-pacmak to get builds going again #911

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.

Sign up for GitHub

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

Merged
TimothyJones merged 13 commits into from
Mar 15, 2025
Merged

chore: Temporarily use forked jsii-pacmak to get builds going again #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6a3a130
Try not packaging fully
TimothyJones Mar 15, 2025
b012eb9
chore: Make test:local run the java tests too
TimothyJones Mar 15, 2025
77029c3
Revert "Try not packaging fully"
TimothyJones Mar 15, 2025
e00c04e
Add more logs
TimothyJones Mar 15, 2025
953bff6
Drop other runs from the matrix for ease of debugging
TimothyJones Mar 15, 2025
0b4b77e
Try pack first to see if it's pack or jsii
TimothyJones Mar 15, 2025
da31189
Run pacmak without parallel
TimothyJones Mar 15, 2025
9e365ce
Remove output from script
TimothyJones Mar 15, 2025
f903a09
test: Use modifed version of pacmak
TimothyJones Mar 15, 2025
75c1aa9
test: Bump trial pacmak version
TimothyJones Mar 15, 2025
f213718
Revert "Drop other runs from the matrix for ease of debugging"
TimothyJones Mar 15, 2025
837b18e
Revert "Try pack first to see if it's pack or jsii"
TimothyJones Mar 15, 2025
7d0e19c
chore: Include the jsii java package in java-only ci
TimothyJones Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/build-java-only.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the

npm install # We can't do npm ci because lerna has optional dependencies :(

# First we have to build the definition-dsl, because it needs to be installed
# for java to build when there are breaking changes
npx lerna run build --scope @contract-case/case-definition-dsl
cd packages/dsl-java
npm run compile
64 changes: 14 additions & 50 deletions nx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,33 @@
{
"targetDefaults": {
"prebuild": {
"dependsOn": [
"^prebuild"
]
"dependsOn": ["^prebuild"]
},
"test": {
"dependsOn": [
"downloadContracts",
"build"
],
"dependsOn": ["downloadContracts", "build"],
"cache": true
},
"build": {
"dependsOn": [
"^build"
],
"outputs": [
"{projectRoot}/dist"
],
"dependsOn": ["^build"],
"outputs": ["{projectRoot}/dist"],
"cache": true
},
"build:docs": {
"dependsOn": [
"^build",
"^build:docs",
"build"
],
"outputs": [
"{projectRoot}/dist"
]
"dependsOn": ["^build", "^build:docs", "build"],
"outputs": ["{projectRoot}/dist"]
},
"build:docs:local": {
"dependsOn": [
"^build",
"^build:docs:local",
"build"
],
"outputs": [
"{projectRoot}/docs"
]
"dependsOn": ["^build", "^build:docs:local", "build"],
"outputs": ["{projectRoot}/docs"]
},
"package": {
"dependsOn": [
"build",
"^package"
],
"outputs": [
"{projectRoot}/dist"
],
"dependsOn": ["build", "^package"],
"outputs": ["{projectRoot}/dist"],
"cache": true
},
"publish:maven": {
"dependsOn": [
"package",
"^publish:maven"
],
"outputs": [
"{projectRoot}/dist"
]
"dependsOn": ["package", "^build", "^publish:maven"],
"outputs": ["{projectRoot}/dist"]
},
"lint": {
"cache": true
Expand All @@ -69,13 +38,8 @@
},
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [],
"production": [
"default"
]
"production": ["default"]
}
}
4 changes: 2 additions & 2 deletions packages/case-definition-dsl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"watch": "jsii -w",
"prepackage": "rimraf dist",
"prepack": "bash -c './script/link-bundled-deps.sh'",
"package": "jsii-pacmak --verbose=3",
"package": "jsii-pacmak --parallel=false --verbose=3",
"postpackage": "bash -c './script/local-maven-install.sh'",
"publish:maven": "publib-maven",
"test": "jest",
Expand Down Expand Up @@ -75,7 +75,7 @@
"@types/jest": "^29.5.12",
"jsii": "^5.7.4",
"jsii-docgen": "^10.6.1",
"jsii-pacmak": "^1.108.0",
"@contract-case/jsii-pacmak": "^0.0.1",
"mkdirp": "^3.0.1",
"prettier": "3.4.2",
"publib": "^0.2.955",
Expand Down
4 changes: 3 additions & 1 deletion packages/case-definition-dsl/script/link-bundled-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the

BASE=$(realpath "$SCRIPT_DIR"/../../../node_modules/@contract-case)

find "$BASE"/* -exec bash -c 'echo $0; mkdir -p '"$SCRIPT_DIR"/..'/node_modules/@contract-case/$(basename $0); cp -R "$0/"* '"$SCRIPT_DIR"'/../node_modules/@contract-case/$(basename "$0") 2>/dev/null; echo done' '{}' \;
# echo "Finding in $BASE"

find "$BASE"/* -exec bash -c 'mkdir -p '"$SCRIPT_DIR"/..'/node_modules/@contract-case/$(basename $0); cp -R "$0/"* '"$SCRIPT_DIR"'/../node_modules/@contract-case/$(basename "$0") 2>/dev/null;' '{}' \;
3 changes: 2 additions & 1 deletion packages/dsl-java/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"scripts": {
"build": "rimraf build && bash install-connector.sh && bash -c './gradlew build testClasses -x test'",
"compile": "bash -c './gradlew build testClasses -x test'",
"test": "bash -c './gradlew test'"
"test": "bash -c './gradlew test'",
"test:local": "bash -c './gradlew test'"
},
"funding": {
"type": "individual",
Expand Down
Loading