diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e245443..90db0f4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -267,7 +267,9 @@ jobs: exit 1 fi - sleep 780; # Wait for 13 minutes before checking the status + SLEEP_BASE=$((60*13)) + echo "Sleeping for $((SLEEP_BASE/60)) minutes before checking the status" + sleep $SLEEP_BASE # Wait before checking the status while true; do status=$(gh run view "$run_id" --json status --jq '.status') diff --git a/crates/stylex-rs-compiler/package.json b/crates/stylex-rs-compiler/package.json index 694107fe..4f256aa0 100644 --- a/crates/stylex-rs-compiler/package.json +++ b/crates/stylex-rs-compiler/package.json @@ -94,7 +94,7 @@ "format:toml:check": "taplo format --check", "lint": "oxlint .", "lint:check": " cargo clippy --all-targets --all-features -- -D warnings", - "postbuild:disable": "pnpm run check:artifacts", + "postbuild": "pnpm run check:artifacts", "prepublishOnly": "napi prepublish --skip-gh-release", "test": "ava", "version": "napi version" diff --git a/package.json b/package.json index f8914a5c..e39c2c5e 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,9 @@ "lexical-core@<1.0.0": "^1.0.0", "lexical@<=6.1.1": "^6.1.1", "@farmfe/runtime@<=0.12.8": "^0.12.10" + }, + "patchedDependencies": { + "scripty@2.1.1": "patches/scripty@2.1.1.patch" } } } diff --git a/patches/scripty@2.1.1.patch b/patches/scripty@2.1.1.patch new file mode 100644 index 00000000..7dcb78ef --- /dev/null +++ b/patches/scripty@2.1.1.patch @@ -0,0 +1,40 @@ +diff --git a/lib/run/spawn-script.js b/lib/run/spawn-script.js +index b05fcb8dea26b0612e3db90506f0df7460e9cf33..3222ec591ea96bb7c7ed5536c6451fb0e79a934f 100644 +--- a/lib/run/spawn-script.js ++++ b/lib/run/spawn-script.js +@@ -1,15 +1,19 @@ + var _ = require('lodash') + var printScript = require('./print-script') +-var spawn = require('child_process').spawn ++var spawn = require('cross-spawn').spawn + + module.exports = function (scriptFile, options, cb) { + printScript(scriptFile) + + const child = spawn(scriptFile, options.userArgs, options.spawn) + +- child.on('close', code => cb(code !== 0 +- ? new Error(`script failed: '${scriptFile}'\nexit status: ${code}`) +- : null, code) ++ child.on('close', (code) => ++ cb( ++ code !== 0 ++ ? new Error(`script failed: '${scriptFile}'\nexit status: ${code}`) ++ : null, ++ code ++ ) + ) + + _.invoke(options, 'spawn.tap', child) +diff --git a/package.json b/package.json +index fddbdf9ab092d3d2f898485bb74627a181878e4b..6d960822724e1526f10cf182ad9dd3d954dad649 100644 +--- a/package.json ++++ b/package.json +@@ -34,6 +34,7 @@ + "dependencies": { + "async": "^2.6.4", + "glob": "^7.0.3", ++ "cross-spawn": "^7.0.6", + "lodash": "^4.17.11", + "resolve-pkg": "^1.0.0" + }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcf6256a..785b992c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,13 +16,18 @@ overrides: lexical@<=6.1.1: ^6.1.1 '@farmfe/runtime@<=0.12.8': ^0.12.10 +patchedDependencies: + scripty@2.1.1: + hash: atqsngqqlys2ip3ev7bmrtxbhu + path: patches/scripty@2.1.1.patch + importers: .: dependencies: scripty: specifier: ^2.1.1 - version: 2.1.1 + version: 2.1.1(patch_hash=atqsngqqlys2ip3ev7bmrtxbhu) devDependencies: '@changesets/cli': specifier: ^2.27.7 @@ -17028,7 +17033,7 @@ snapshots: ajv-formats: 2.1.1(ajv@8.17.1) ajv-keywords: 5.1.0(ajv@8.17.1) - scripty@2.1.1: + scripty@2.1.1(patch_hash=atqsngqqlys2ip3ev7bmrtxbhu): dependencies: async: 2.6.4 glob: 7.2.3