Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
"ignore": ["crisp", "enclave-example", "crisp-client", "enclave-docs", "enclave-client"]
}
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ jobs:
ls -la target/debug/fake_encrypt || echo "fake_encrypt not found"
ls -la target/debug/pack_e3_params || echo "pack_e3_params not found"
ls -la ~/.cargo/bin/enclave || echo "enclave binary not found"
ls -la packages/evm/dist || echo "SDK dist not found"
ls -la packages/enclave-contracts/dist || echo "SDK dist not found"
ls -la crates/wasm/dist || echo "WASM dist not found"
- name: "Set executable permissions"
run: |
Expand Down Expand Up @@ -545,10 +545,10 @@ jobs:
name: sdk-artifacts
path: |
packages/enclave-sdk/dist
packages/evm/dist
packages/evm/artifacts
packages/evm/cache
packages/evm/typechain-types
packages/enclave-contracts/dist
packages/enclave-contracts/artifacts
packages/enclave-contracts/cache
packages/enclave-contracts/typechain-types
crates/wasm/dist
retention-days: 1
if-no-files-found: warn
Expand Down Expand Up @@ -596,7 +596,7 @@ jobs:
echo "Checking downloaded artifacts:"
ls -la ~/.cargo/bin/enclave || echo "enclave binary not found"
ls -la templates/default/target/debug/e3-support-scripts-dev || echo "support scripts not found"
ls -la packages/evm/dist || echo "SDK dist not found"
ls -la packages/enclave-contracts/dist || echo "SDK dist not found"
ls -la crates/wasm/dist || echo "WASM dist not found"
echo "Support scripts permissions:"
ls -la templates/default/target/debug/e3-support-scripts-dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ec2-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ on:
paths:
- "Cargo.*"
- "crates/**"
- "packages/evm/contracts/**"
- "packages/enclave-contracts/contracts/**"
pull_request:
branches:
- release
- main
paths:
- "Cargo.*"
- "crates/**"
- "packages/evm/contracts/**"
- "packages/enclave-contracts/contracts/**"

env:
DOCKERFILE_PATH: crates/Dockerfile
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
git status --porcelain || true

echo "Checking for problematic files:"
ls -la packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ 2>/dev/null || echo "ICiphernodeRegistry.sol directory not found"
ls -la packages/evm/artifacts/contracts/interfaces/IEnclave.sol/ 2>/dev/null || echo "IEnclave.sol directory not found"
ls -la packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/ 2>/dev/null || echo "NaiveRegistryFilter.sol directory not found"
ls -la packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ 2>/dev/null || echo "ICiphernodeRegistry.sol directory not found"
ls -la packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/ 2>/dev/null || echo "IEnclave.sol directory not found"
ls -la packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/ 2>/dev/null || echo "NaiveRegistryFilter.sol directory not found"

# Remove the specific problematic files from git tracking if they exist
git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json" || true
git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json" || true
git rm --cached --ignore-unmatch "packages/evm/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json" || true
git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/interfaces/ICiphernodeRegistry.sol/ICiphernodeRegistry.json" || true
git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/interfaces/IEnclave.sol/IEnclave.json" || true
git rm --cached --ignore-unmatch "packages/enclave-contracts/artifacts/contracts/registry/NaiveRegistryFilter.sol/NaiveRegistryFilter.json" || true

# Ensure we're on the main branch and up to date
git checkout main
Expand All @@ -61,11 +61,11 @@ jobs:
git reset --hard HEAD

# Force remove the entire artifacts directory (it should be regenerated by .gitignore rules)
rm -rf packages/evm/artifacts/ || true
rm -rf packages/evm/cache/ || true
rm -rf packages/evm/types/ || true
rm -rf packages/evm/node_modules/ || true
rm -rf packages/evm/dist/ || true
rm -rf packages/enclave-contracts/artifacts/ || true
rm -rf packages/enclave-contracts/cache/ || true
rm -rf packages/enclave-contracts/types/ || true
rm -rf packages/enclave-contracts/node_modules/ || true
rm -rf packages/enclave-contracts/dist/ || true

# Also clean up any Rust build artifacts
rm -rf target/ || true
Expand Down
Loading
Loading