Skip to content

Commit dfc37aa

Browse files
authored
Merge pull request #3398 from demergent-labs/fix_maintenance
fix diff check and add `@dfinity/identity-secp256k1` dependencies
2 parents acb3c8b + b74ac8c commit dfc37aa

File tree

25 files changed

+1173
-681
lines changed

25 files changed

+1173
-681
lines changed

.github/workflows/maintenance.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,20 @@ jobs:
178178
- name: Check for differences
179179
id: check-diff
180180
run: |
181+
set -e
182+
BASE_BRANCH="${{ needs.create-branch-prefix.outputs.base-branch }}"
183+
echo "Checking for differences between main and $BASE_BRANCH"
184+
185+
# Fetch both branches
181186
git fetch origin main
182-
if git diff --quiet origin/main ${{ needs.create-branch-prefix.outputs.base-branch }}; then
187+
git fetch origin "$BASE_BRANCH"
188+
189+
# Compare the branches using proper remote refs
190+
if git diff --quiet origin/main "origin/$BASE_BRANCH"; then
183191
echo "No differences found between branches"
184192
echo "has_changes=false" >> $GITHUB_OUTPUT
185193
else
186-
echo "Changes detected"
194+
echo "Changes detected between branches"
187195
echo "has_changes=true" >> $GITHUB_OUTPUT
188196
fi
189197

examples/experimental/test/end_to_end/http_server/apollo_server/package-lock.json

Lines changed: 96 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/experimental/test/end_to_end/http_server/apollo_server/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"azle-experimental-deps": "github:demergent-labs/azle-experimental-deps#d520f28563b2d255c7edf5b672da6083fd722259",
1010
"express": "^4.18.2",
1111
"graphql": "^16.8.1"
12+
},
13+
"devDependencies": {
14+
"@dfinity/identity-secp256k1": "3.2.1"
1215
}
1316
}

0 commit comments

Comments
 (0)