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.

Sign up for GitHub

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

Remove git-tree-sha1 from metadata #480

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Remove git-tree-sha1 from metadata #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33f0db
Remove git-tree-sha1 from metadata
vers-w Oct 9, 2024
0d2ac86
Fix SSL error on Windows during build task
vers-w Oct 9, 2024
42b8da9
Add commit and tag info
vers-w Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions build/create_binaries/add_metadata.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,22 @@ function add_metadata(project_dir, license_file, output_dir, git_repo)
error("Manifest.toml is in the old format, run Pkg.upgrade_manifest()")
end
julia_version = manifest["julia_version"]
wflow_entry = only(manifest["deps"]["Wflow"])
tree = wflow_entry["git-tree-sha1"]
version = TOML.parsefile(normpath(git_repo, "Project.toml"))["version"]
repo = GitRepo(git_repo)
branch = LibGit2.head(repo)
# commit = LibGit2.peel(LibGit2.GitCommit, branch)
commit = LibGit2.peel(LibGit2.GitCommit, branch)
short_name = LibGit2.shortname(branch)
# short_commit = string(LibGit2.GitShortHash(LibGit2.GitHash(commit), 10))
short_commit = string(LibGit2.GitShortHash(LibGit2.GitHash(commit), 10))

# get the release from the current tag, like `git describe --tags`
# if it is a commit after a tag, it will be <tag>-g<short-commit>
options = LibGit2.DescribeOptions(; describe_strategy = LibGit2.Consts.DESCRIBE_TAGS)
result = LibGit2.GitDescribeResult(repo; options)
suffix = "-dirty"
foptions =
LibGit2.DescribeFormatOptions(; dirty_suffix = Base.unsafe_convert(Cstring, suffix))
GC.@preserve suffix tag = LibGit2.format(result; options = foptions)[2:end] # skip v prefix

url = "https://github.com/Deltares/Wflow.jl/tree"
version_info = """

Expand All @@ -56,8 +64,9 @@ function add_metadata(project_dir, license_file, output_dir, git_repo)
This build uses the Wflow.jl version mentioned below.

```toml
release = "$tag"
version = "$version"
git-tree-sha1 = "$tree"
commit = "$url/$short_commit"
branch = "$url/$short_name"
julia_version = "$julia_version"
```"""
Expand Down
4 changes: 2 additions & 2 deletions pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ platforms = ["win-64", "linux-64"]
install-julia = "juliaup add 1.10.5 && juliaup override unset && juliaup override set 1.10.5"
# Julia
update-registry-julia = "julia --eval='using Pkg; Registry.update()'"
instantiate-julia = "julia --project --eval='using Pkg; Pkg.instantiate()'"
instantiate-julia = {cmd = "julia --project --eval='using Pkg; Pkg.instantiate()'",env = { JULIA_SSL_CA_ROOTS_PATH = "" } }
initialize-julia = { depends_on = [
"update-registry-julia",
"instantiate-julia",
Expand All @@ -28,7 +28,7 @@ download-test-data = { cmd = "julia --project download_test_data.jl", cwd = "bui
build-wflow-cli = { cmd = "julia --project create_app.jl", cwd = "build/create_binaries", depends_on = [
"download-test-data",
"instantiate-wflow-cli",
] }
], env = { JULIA_SSL_CA_ROOTS_PATH = "" } }
# Test
test-wflow-cli = { cmd = "julia --project --eval 'using Pkg; Pkg.test()'", cwd = "build/wflow_cli", depends_on = [
"download-test-data",
Expand Down
Loading