Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base.GIT_VERSION_INFO: record the Buildkite commit that was used to build Julia #43073

Merged
merged 3 commits into from
Nov 22, 2021

Conversation

DilumAluthge
Copy link
Member

No description provided.

@DilumAluthge DilumAluthge added building Build system, or building Julia or its dependencies ci Continuous integration labels Nov 14, 2021
base/version_git.sh Outdated Show resolved Hide resolved
base/version_git.sh Outdated Show resolved Hide resolved
@DilumAluthge
Copy link
Member Author

Bump @staticfloat

@DilumAluthge DilumAluthge force-pushed the dpa/version-git-buildkite-commit branch from 5d1c1eb to cf0b519 Compare November 17, 2021 02:42
@DilumAluthge
Copy link
Member Author

Bump @staticfloat

base/version_git.sh Outdated Show resolved Hide resolved
base/version_git.sh Outdated Show resolved Hide resolved
@DilumAluthge DilumAluthge force-pushed the dpa/version-git-buildkite-commit branch from ad2cbd1 to 9212bcf Compare November 22, 2021 02:51
@DilumAluthge DilumAluthge added backport 1.6 Change should be backported to release-1.6 backport 1.7 merge me PR is reviewed. Merge when all tests are passing labels Nov 22, 2021
@DilumAluthge DilumAluthge merged commit a21cc80 into master Nov 22, 2021
@DilumAluthge DilumAluthge deleted the dpa/version-git-buildkite-commit branch November 22, 2021 08:14
@DilumAluthge DilumAluthge removed the merge me PR is reviewed. Merge when all tests are passing label Nov 22, 2021
@@ -82,6 +84,16 @@ if [ -z "$fork_master_timestamp" ]; then
fork_master_timestamp="0"
fi

build_system_directory="../.buildkite"
if [[ -d "${build_system_directory}/.git" ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a /bin/sh script so this errors.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which part errors? I just ran the following locally inside /bin/sh, and it seemed to work fine for me.

build_system_directory="../.buildkite"
if [[ -d "${build_system_directory}/.git" ]]; then
    echo "foo"
else
    echo "bar"
fi

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably /bin/sh is bash for you then. On Ubuntu, at least, /bin/sh is dash by default, and there you get

.../version_git.sh: 88: [[: not found

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[[ is a bashism

build_system_commit=$(git -C "${build_system_directory}" rev-parse HEAD)
build_system_commit_short=$(git -C "${build_system_directory}" rev-parse --short HEAD)
else
echo "Warning: The build system directory does not exist or is not a Git repo: ${build_system_directory}" >&2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this?

KristofferC pushed a commit that referenced this pull request Nov 25, 2021
KristofferC pushed a commit that referenced this pull request Nov 26, 2021
KristofferC pushed a commit that referenced this pull request Nov 26, 2021
KristofferC pushed a commit that referenced this pull request Dec 2, 2021
@KristofferC KristofferC mentioned this pull request Dec 2, 2021
29 tasks
@KristofferC KristofferC mentioned this pull request Dec 2, 2021
15 tasks
@KristofferC KristofferC removed the backport 1.6 Change should be backported to release-1.6 label Dec 11, 2021
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Feb 22, 2022
LilithHafner pushed a commit to LilithHafner/julia that referenced this pull request Mar 8, 2022
staticfloat pushed a commit that referenced this pull request Dec 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies ci Continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants