Skip to content

Commit

Permalink
Merge branch 'main' into dpa/debug-win
Browse files Browse the repository at this point in the history
  • Loading branch information
DilumAluthge authored Aug 19, 2024
2 parents ec86f30 + 890b81c commit 33a7c9b
Show file tree
Hide file tree
Showing 59 changed files with 764 additions and 486 deletions.
28 changes: 20 additions & 8 deletions .buildkite/hooks/post-checkout
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,20 @@ UPSTREAM_BRANCH="${UPSTREAM_BRANCH:-master}"
# We're going to cache repositories in here, just like buildkite itself would:
UPSTREAM_CACHE="${BUILDKITE_PLUGIN_JULIA_CACHE_DIR?}/repos/$(tr ':/.' '---' <<<"${UPSTREAM_URL}")"

if [[ ! -d "${UPSTREAM_CACHE}" ]]; then
echo "Clone ${UPSTREAM_URL}"
mkdir -p "$(dirname "${UPSTREAM_CACHE}")"
git clone --mirror "${UPSTREAM_URL}" "${UPSTREAM_CACHE}"
else
echo "Update cache for ${UPSTREAM_URL}"
git -C "${UPSTREAM_CACHE}" fetch
DISABLE_UPSTREAM_CACHE="false"
if [[ "$(uname)" == "FreeBSD" ]]; then
DISABLE_UPSTREAM_CACHE="true"
fi

if [[ "${DISABLE_UPSTREAM_CACHE}" != "true" ]]; then
if [[ ! -d "${UPSTREAM_CACHE}" ]]; then
echo "Clone ${UPSTREAM_URL}"
mkdir -p "$(dirname "${UPSTREAM_CACHE}")"
git clone --mirror "${UPSTREAM_URL}" "${UPSTREAM_CACHE}"
else
echo "Update cache for ${UPSTREAM_URL}"
git -C "${UPSTREAM_CACHE}" fetch
fi
fi

# Clear out current directory
Expand All @@ -26,7 +33,12 @@ rm -rf ..?* .[!.]* *

# git clone, then force checkout the given gitref
UPSTREAM_GITREF="$(buildkite-agent meta-data get --default "origin/${UPSTREAM_BRANCH}" BUILDKITE_JULIA_VERSION)"
git clone --dissociate --reference "${UPSTREAM_CACHE}" "${UPSTREAM_URL}" "./"

if [[ "${DISABLE_UPSTREAM_CACHE}" != "true" ]]; then
git clone --dissociate --reference "${UPSTREAM_CACHE}" "${UPSTREAM_URL}" "./"
else
git clone "${UPSTREAM_URL}" "./"
fi
git reset --hard "${UPSTREAM_GITREF}"
echo
git --no-pager log -1
Expand Down
7 changes: 7 additions & 0 deletions .kodiak.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# .kodiak.toml

version = 1
merge.delete_branch_on_merge = true
merge.prioritize_ready_to_merge=true
merge.priority_merge_label="automerge_priority"
merge.method="squash"
Loading

0 comments on commit 33a7c9b

Please sign in to comment.