Add env variable

valkey-io · Apr 30, 2024 · aaab436 · aaab436
1 parent 5312683
commit aaab436
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/build-python-wrapper/action.yml b/.github/workflows/build-python-wrapper/action.yml
@@ -38,9 +38,10 @@ runs:
         - name: Install Python software dependencies
           shell: bash
           run: |
+              INSTALL_FLAGS=`if [[ "${{ inputs.os }}" =~ .*"macos".*  ]]; then echo "--break-system-packages"; else echo ""; fi`
               python3 -m ensurepip --upgrade || true
-              python3 -m pip install --upgrade pip
-              python3 -m pip install virtualenv mypy-protobuf --break-system-packages
+              python3 -m pip install --upgrade pip $INSTALL_FLAGS
+              python3 -m pip install virtualenv mypy-protobuf $INSTALL_FLAGS
 
         - name: Generate protobuf files
           shell: bash
@@ -58,6 +59,5 @@ runs:
               source "$HOME/.cargo/env"
               python3 -m venv .env
               source .env/bin/activate
-              python3 -m pip install --upgrade pip
               python3 -m pip install --no-cache-dir -r requirements.txt
               maturin develop
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -130,6 +130,7 @@ jobs:
               with:
                   os: "macos"
                   named_os: "darwin"
+                  arch: "arm64"
                   target: "aarch64-apple-darwin"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/test-benchmark/action.yml b/.github/workflows/test-benchmark/action.yml
@@ -5,6 +5,13 @@ inputs:
         description: "flag that tells the benchmark to run a certain language"
         required: true
         type: string
+    env-variables:
+        description: "Run the benchmark with the passed environment variables. 
+          Should be formatted as a list of variable names and their values. 
+          For example 'ENV1=VALUE1 ENV2=VALUE2'"
+        required: false
+        type: string
+        default: ''
 
 runs:
     using: "composite"
@@ -15,4 +22,7 @@ runs:
 
         - shell: bash
           working-directory: ./benchmarks
-          run: echo $DOTNET_FRAMEWORK && ./install_and_test.sh -no-tls -minimal -only-glide -data 1 -tasks 10 ${{ inputs.language-flag }}
+          run: |
+            echo ${DOTNET_FRAMEWORK}
+            # if [ "${{ inputs.env-variables }}" != '' ]; then export ${{ inputs.env-variables }}; fi 
+            ${{ inputs.env-variables }} ./install_and_test.sh -no-tls -minimal -only-glide -data 1 -tasks 10 ${{ inputs.language-flag }}