Skip to content

Commit a3682ae

Browse files
committed
Merge branch 'master' into to-output-refactor
2 parents c7bfd1a + c4e5ca8 commit a3682ae

File tree

2 files changed

+10
-1
lines changed
  • .github/workflows
  • juniper_graphql_ws/src/graphql_transport_ws

2 files changed

+10
-1
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,15 @@ jobs:
384384
${{ steps.tag.outputs.group2 }}/Cargo.toml \
385385
| cut -d '"' -f2)"
386386
387+
- name: Ensure CHANGELOG date is today
388+
run: |
389+
today="$(date '+%Y-%m-%d')"
390+
changelog="$(grep -E '^## \[${{ steps.tag.outputs.group3 }}\] ·' \
391+
${{ steps.tag.outputs.group2 }}/CHANGELOG.md \
392+
| cut -d' ' -f4 | tr -d ' ')"
393+
echo "Changelog: $changelog"
394+
echo "Today: $today"
395+
[ "$changelog" = "$today" ]
387396
- name: Parse CHANGELOG link
388397
id: changelog
389398
run: echo "link=${{ github.server_url }}/${{ github.repository }}/blob/${{ steps.tag.outputs.group1 }}/${{ steps.tag.outputs.group2 }}/CHANGELOG.md#$(sed -n '/^## \[${{ steps.tag.outputs.group3 }}\]/{s/^## \[\(.*\)\][^0-9]*\([0-9].*\)/\1--\2/;s/[^0-9a-z-]*//g;p;}' ${{ steps.tag.outputs.group2 }}/CHANGELOG.md)"

juniper_graphql_ws/src/graphql_transport_ws/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl<S: Schema, I: Init<S::ScalarValue, S::Context>> ConnectionState<S, I> {
162162
// We already have an operation with this id. We must close the connection.
163163
Output::Close {
164164
code: 4409,
165-
message: format!("Subscriber for {} already exists", id),
165+
message: format!("Subscriber for {id} already exists"),
166166
}
167167
.into_stream()
168168
} else {

0 commit comments

Comments
 (0)