diff --git a/.github/get-docker-tag.sh b/.github/get-docker-tag.sh index 9ed9f0f7..8dea07ba 100755 --- a/.github/get-docker-tag.sh +++ b/.github/get-docker-tag.sh @@ -8,26 +8,24 @@ # Exit immediately if a command exits with a non-zero status set -e - -# Execute this in a separate bash process -( - # Read tt-mlir version from third_party/CMakeLists.txt and clone third_party/tt-mlir +MLIR_DOCKER_TAG=$( + # Read tt-mlir version from third_party/CMakeLists.txt + # clone tt-mlir version to tmp/third_party/tt-mlir # Get the MLIR docker tag + TT_MLIR_PATH=tmp/third_party/tt-mlir TT_MLIR_VERSION=$(grep -oP 'set\(TT_MLIR_VERSION "\K[^"]+' third_party/CMakeLists.txt) - if [ ! -d "third_party/tt-mlir" ]; then - git clone https://github.com/tenstorrent/tt-mlir.git third_party/tt-mlir --quiet + if [ ! -d $TT_MLIR_PATH ]; then + git clone https://github.com/tenstorrent/tt-mlir.git $TT_MLIR_PATH --quiet fi - cd third_party/tt-mlir + cd $TT_MLIR_PATH git fetch --quiet git checkout $TT_MLIR_VERSION --quiet if [ -f ".github/get-docker-tag.sh" ]; then - MLIR_DOCKER_TAG=$(.github/get-docker-tag.sh) + .github/get-docker-tag.sh else - MLIR_DOCKER_TAG="default-tag" + echo "default-tag" fi - cd ../.. ) - -DOCKERFILE_HASH_FILES=".github/Dockerfile.base .github/Dockerfile.ci" -DOCKERFILE_HASH=$( (echo $MLIR_DOCKER_TAG; sha256sum $DOCKERFILE_HASH_FILES) | sha256sum | cut -d ' ' -f 1) -echo dt-$DOCKERFILE_HASH +DOCKERFILE_HASH=$( (cat .github/Dockerfile.base .github/Dockerfile.ci | sha256sum) | cut -d ' ' -f 1) +COMBINED_HASH=$( (echo $DOCKERFILE_HASH $MLIR_DOCKER_TAG | sha256sum) | cut -d ' ' -f 1) +echo dt-$COMBINED_HASH