Skip to content

Commit

Permalink
Merge branch 'trunk' into xc-tray-localization-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
CurtlyCritchlow authored Nov 7, 2024
2 parents 5d39844 + 8afe1e0 commit 96f38a5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python-sshnpd-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
name: sshnpd-python-package
path: dist/
- name: Publish distribution to TestPyPI
uses: pypa/gh-action-pypi-publish@61da13deb5f5124fb1536194f82ed3d9bbc7e8f3 # v1.12.0
uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
with:
skip-existing: true
attestations: true
Expand All @@ -99,7 +99,7 @@ jobs:
name: sshnpd-python-package
path: dist/
- name: Publish distribution to PyPI
uses: pypa/gh-action-pypi-publish@61da13deb5f5124fb1536194f82ed3d9bbc7e8f3 # v1.12.0
uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
with:
attestations: true

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e_all/scripts/tests/v4_dart_inline
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ daemonVersion="$1"
clientVersion="$2"

if [[ ${daemonVersion:0:1} == "c" ]]; then
logInfo " N/A because c daemon isn't compatible with v4 clients"
logInfo " N/A because C daemon isn't compatible with v4 clients"
exit 50
fi

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e_all/scripts/tests/v4_openssh_print
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ daemonVersion="$1"
clientVersion="$2"

if [[ ${daemonVersion:0:1} == "c" ]]; then
logInfo " N/A because c daemon isn't compatible with v4 clients"
logInfo " N/A because C daemon isn't compatible with v4 clients"
exit 50
fi

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e_all/scripts/tests/v5_dart_inline
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ daemonVersion="$1"
clientVersion="$2"

if [[ ${daemonVersion:0:1} == "c" ]] && [[ $(versionIsLessThan "$clientVersion" "d:5.3.0") == "true" ]]; then
logInfo " N/A because c daemon requires clients >= v5.3.0"
logInfo " N/A because C daemon requires clients >= v5.3.0"
exit 50
fi

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e_all/scripts/tests/v5_openssh_inline
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ daemonVersion="$1"
clientVersion="$2"

if [[ ${daemonVersion:0:1} == "c" ]] && [[ $(versionIsLessThan "$clientVersion" "d:5.3.0") == "true" ]]; then
logInfo " N/A because c daemon requires clients >= v5.3.0"
logInfo " N/A because C daemon requires clients >= v5.3.0"
exit 50
fi

Expand Down

0 comments on commit 96f38a5

Please sign in to comment.