Skip to content

Commit fa2fbc5

Browse files
committed
Fix merge
1 parent 894c550 commit fa2fbc5

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/actions/gke-xpk/action.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@ runs:
207207
# set container commands in-line
208208
CMD=$(echo ${PRELUDE} ${CMD} ${POSTLUDE} | sed 's/\n/\ /g')
209209
echo "CMD=${CMD}" >> ${GITHUB_ENV}
210-
PRELUDE=$(echo ${PRELUDE} | sed 's/\n/\ /g')
211-
POSTLUDE=$(echo ${POSTLUDE} | sed 's/\n/\ /g')
212-
CMD=$(echo ${CMD} | sed 's/\n/\ /g')
213-
214-
echo "CMD=${PRELUDE} ${CMD} ${POSTLUDE}" >> ${GITHUB_ENV}
215210

216211
- name: Create workload on cluster with XPK
217212
shell: bash -x -e -u {0}
@@ -234,7 +229,9 @@ runs:
234229
)
235230
236231
version_geq() {
237-
if [[ $(echo -e "$1\n$2" | sort -V | head -n 1) != "$1" ]]; then
232+
if [[ $1 == $2 ]]; then
233+
return 0
234+
elif [[ $(echo -e "$1\n$2" | sort -V | head -n 1) != "$1" ]]; then
238235
return 0
239236
fi
240237
return 1
@@ -246,6 +243,13 @@ runs:
246243
--env="JAX_COORDINATOR_PORT=3389"
247244
--env="JAX_COORDINATOR_ADDRESS=\$(JOBSET_NAME)-\$(REPLICATED_JOB_NAME)-0-0.\$(JOBSET_NAME):3389"
248245
)
246+
247+
envs_flat=$(echo "${{ inputs.ENVS }}" | tr '\n' ' ')
248+
IFS=';' read -ra env_vars <<< "${envs_flat}"
249+
for env in "${env_vars[@]}"; do
250+
env=$(echo "${env}" | xargs)
251+
[[ -n "${env}" ]] && args+=(--env="${env}")
252+
done
249253
fi
250254
251255
if version_geq "${{ inputs.XPK_VERSION }}" "v1.0.0"; then

0 commit comments

Comments
 (0)