Skip to content

Commit

Permalink
Merge branch 'main' into nathan/add-proof-of-absence-support
Browse files Browse the repository at this point in the history
  • Loading branch information
krpeacock authored Jun 3, 2024
2 parents 2ef1692 + a881e96 commit bdee61b
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 32 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/conventional-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: dfinity/conventional-pr-title-action@v2.2.3
- uses: dfinity/conventional-pr-title-action@v4.0.0
with:
success-state: Title follows the specification.
failure-state: Title does not follow the specification.
context-name: conventional-pr-title
preset: conventional-changelog-angular@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions demos/sample-javascript/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1>Identity</h1>
<h2>Sign In</h2>
<div>
<label for="idpUrl" style="display: inline-block; width: 120px">Identity Provider: </label>
<input type="text" id="idpUrl" value="https://identity.messaging.ic0.app/#authorize" />
<input type="text" id="idpUrl" value="https://identity.ic0.app/" />
</div>
<button id="signinBtn">Sign In</button>
<button id="signoutBtn">Sign Out</button>
Expand All @@ -16,7 +16,7 @@ <h2>Principal:</h2>
<div>
<h1>Contact the IC</h1>
<label for="hostUrl" style="display: inline-block; width: 120px">Replica URL: </label>
<input type="text" id="hostUrl" value="https://gw.dfinity.network/" />
<input type="text" id="hostUrl" value="https://icp-api.io/" />
<br />
<label for="canisterId" style="display: inline-block; width: 120px">Canister ID: </label>
<input type="text" id="canisterId" value="4k2wq-cqaaa-aaaab-qac7q-cai" />
Expand Down
7 changes: 7 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@

- feat!: add support for proof of absence in Certificate lookups

### Changed

- fix: publish script will correctly update the `package-lock.json` file with the correct dependencies when making a new release
- chore: updates agent error response to read "Gateway returns error" instead of "Server"`
- chore: updates dfinity/conventional-pr-title-action to v4.0.0
- chore: updates dfinity/conventional-pr-title-action to v3.2.0

## [1.3.0] - 2024-05-01

### Added
Expand Down
55 changes: 28 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@
"git pull",
"git checkout release/${version} 2>/dev/null || git checkout -b release/${version}",
"git merge main",
"npm run build",
"npm install",
"npm audit fix",
"git add .",
"git commit -m 'chore: release ${version}'",
"git push --set-upstream origin release/${version}"
],
"after:release": [
Expand Down
2 changes: 1 addition & 1 deletion packages/agent/src/agent/http/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ export class HttpAgent implements Agent {
};
} else {
throw new AgentHTTPResponseError(
`Server returned an error:\n` +
`Gateway returned an error:\n` +
` Code: ${fetchResponse.status} (${fetchResponse.statusText})\n` +
` Body: ${await fetchResponse.text()}\n`,
{
Expand Down

0 comments on commit bdee61b

Please sign in to comment.