Skip to content

Commit b246495

Browse files
authored
Merge branch 'main' into alechan/upgrade-xpk-v0.13.0
2 parents f9102aa + c3de4f1 commit b246495

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/container/Dockerfile.axlearn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1-labs
22
ARG BASE_IMAGE=ghcr.io/nvidia/jax-mealkit:jax
3-
ARG URLREF_AXLEARN=https://github.com/apple/axlearn.git
3+
ARG URLREF_AXLEARN=https://github.com/apple/axlearn.git#main
44
ARG SRC_PATH_AXLEARN=/opt/axlearn
55
ARG DEST_MANIFEST_DIR=/opt/manifest.d
66
ARG GIT_USER_NAME=JAX Toolbox

.github/container/git-clone.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,17 @@ fi
6666

6767
## check out the source
6868
GIT_REPO=$(cut -d# -f1 <<< $GIT_URLREF)
69-
GIT_REF=$(cut -d# -f2- <<< $GIT_URLREF)
69+
GIT_REF=$(cut -s -d# -f2- <<< $GIT_URLREF)
7070

7171
echo "Fetching $GIT_REPO#$GIT_REF to $DESTINATION"
7272

7373
set -ex -o pipefail
7474

7575
git clone ${GIT_REPO} ${DESTINATION}
7676
pushd ${DESTINATION}
77-
git checkout ${GIT_REF}
77+
if [[ -n "${GIT_REF}" ]]; then
78+
git checkout ${GIT_REF}
79+
fi
7880
COMMIT_SHA=$(git rev-parse HEAD)
7981
git submodule update --init --recursive
8082
popd

0 commit comments

Comments
 (0)