Skip to content

Commit

Permalink
Merge branch 'valkey-io:main' into main
Browse files Browse the repository at this point in the history
Signed-off-by: Adar Ovadia <[email protected]>
  • Loading branch information
adarovadya authored and Adar Ovadia committed Jul 9, 2024
2 parents bda7f65 + 55caeeb commit 8a202fb
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node-create-package-file/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ runs:
# echo -musl if inputs.target is musl
export MUSL_FLAG=`if [[ "${{ inputs.target }}" =~ .*"musl".* ]]; then echo "-musl"; fi`
# set the package name
name="glide-for-redis"
name="valkey-glide"
# derive the OS and architecture from the inputs
export node_os="${{ inputs.named_os }}"
export node_arch="${{ inputs.arch }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/npm-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ jobs:
shell: bash
working-directory: ./node/npm/glide
run: |
export pkg_name=glide-for-redis
export pkg_name=valkey-glide
echo "${GITHUB_REF:11}"
export package_version=${GITHUB_REF:11}
export scope=`if [ "$NPM_SCOPE" != '' ]; then echo "$NPM_SCOPE/"; fi`
Expand Down Expand Up @@ -361,7 +361,7 @@ jobs:
working-directory: ./utils/release-candidate-testing/node
run: |
npm install
npm install --no-save @aws/glide-for-redis@${{ env.NPM_TAG }}
npm install --no-save @valkey/valkey-glide@${{ env.NPM_TAG }}
npm run test
# Reset the repository to make sure we get the clean checkout of the action later in other actions.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
run: |
# Remove the glide-rs dependency to avoid duplication
sed -i '/ "glide-rs":/d' ../../package.json
export pkg_name=glide-for-redis-base
export pkg_name=valkey-glide-base
export package_version="${{ env.RELEASE_VERSION }}"
export scope=`if [ "$NPM_SCOPE" != '' ]; then echo "$NPM_SCOPE/"; fi`
mv package.json package.json.tmpl
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
run: |
export BRANCH_NAME=`if [ "$EVENT_NAME" == 'schedule' ] || [ "$EVENT_NAME" == 'pull_request' ]; then echo 'scheduled-ort'; else echo "ort-v$INPUT_VERSION"; fi`
echo "Creating pull request from branch ${BRANCH_NAME} to branch ${{ env.BASE_BRANCH }}"
git config --global user.email "[email protected]"
git config --global user.email "[email protected]"
git config --global user.name "ort-bot"
git checkout -b ${BRANCH_NAME}
git add $PYTHON_ATTRIBUTIONS $NODE_ATTRIBUTIONS $RUST_ATTRIBUTIONS $JAVA_ATTRIBUTIONS
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@types/command-line-args": "^5.2.0",
"@types/stats-lite": "^2.2.0",
"command-line-args": "^5.2.1",
"glide-for-redis": "file:../../node",
"valkey-glide": "file:../../node",
"ioredis": "5.3.2",
"percentile": "^1.6.0",
"redis": "4.6.13",
Expand Down
6 changes: 3 additions & 3 deletions examples/node/README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ npm i -g npm@8
## Build
To build GLIDE's Node client, run (on unix based systems):
```
cd glide-for-redis/node
cd valkey-glide/node
git submodule update --init --recursive
npm install
rm -rf build-ts
npm run build:release
cd glide-for-redis/examples/node
cd valkey-glide/examples/node
npm install
npx tsc
```

## Run
To run the example:
```
cd glide-for-redis/examples/node
cd valkey-glide/examples/node
node index.js
```
2 changes: 1 addition & 1 deletion examples/node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "module",
"dependencies": {
"@aws/glide-for-redis": "^0.1.0",
"@valkey/valkey-glide": "^1.0.0",
"@types/node": "^20.4.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
glide-for-redis>=0.1
valkey-glide
4 changes: 2 additions & 2 deletions glide-core/THIRD_PARTY_LICENSES_RUST
Original file line number Diff line number Diff line change
Expand Up @@ -22969,7 +22969,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: syn:2.0.69
Package: syn:2.0.70

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -24572,7 +24572,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: tinyvec:1.7.0
Package: tinyvec:1.8.0

The following copyrights and licenses were found in the source code of this package:

Expand Down
4 changes: 2 additions & 2 deletions java/THIRD_PARTY_LICENSES_JAVA
Original file line number Diff line number Diff line change
Expand Up @@ -23864,7 +23864,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: syn:2.0.69
Package: syn:2.0.70

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -25467,7 +25467,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: tinyvec:1.7.0
Package: tinyvec:1.8.0

The following copyrights and licenses were found in the source code of this package:

Expand Down
4 changes: 2 additions & 2 deletions node/THIRD_PARTY_LICENSES_NODE
Original file line number Diff line number Diff line change
Expand Up @@ -24594,7 +24594,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: syn:2.0.69
Package: syn:2.0.70

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -26655,7 +26655,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: tinyvec:1.7.0
Package: tinyvec:1.8.0

The following copyrights and licenses were found in the source code of this package:

Expand Down
8 changes: 4 additions & 4 deletions python/THIRD_PARTY_LICENSES_PYTHON
Original file line number Diff line number Diff line change
Expand Up @@ -25034,7 +25034,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: syn:2.0.69
Package: syn:2.0.70

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -25263,7 +25263,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: target-lexicon:0.12.14
Package: target-lexicon:0.12.15

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -26861,7 +26861,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

----

Package: tinyvec:1.7.0
Package: tinyvec:1.8.0

The following copyrights and licenses were found in the source code of this package:

Expand Down Expand Up @@ -37841,7 +37841,7 @@ The following copyrights and licenses were found in the source code of this pack

----

Package: google-auth:2.31.0
Package: google-auth:2.32.0

The following copyrights and licenses were found in the source code of this package:

Expand Down

0 comments on commit 8a202fb

Please sign in to comment.