Skip to content

Commit

Permalink
Manifest.toml files build and wflow version
Browse files Browse the repository at this point in the history
- Remove wflow version from Manifest.toml files (build) otherwise test-wflow-cli workflow fails (ERROR: expected package `Wflow [d48b7d99]` to exist at path `C:\Users\svc-teamcity-ansible\.julia\packages\Wflow\zzRQr`)
- Extract wflow version from Project.toml file
  • Loading branch information
vers-w committed Aug 21, 2024
1 parent 42461bf commit e2fa040
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions build/create_binaries/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -653,10 +653,8 @@ version = "0.21.70"
[[deps.Wflow]]
deps = ["BasicModelInterface", "CFTime", "Dates", "DelimitedFiles", "FieldMetadata", "Glob", "Graphs", "IfElse", "LoggingExtras", "LoopVectorization", "NCDatasets", "Parameters", "Polyester", "ProgressLogging", "Random", "StaticArrays", "Statistics", "TOML", "TerminalLoggers", "UnPack"]
git-tree-sha1 = "414d32f07561872f03cb4f347df719962dfddc5e"
repo-rev = "master"
path = "../.."
uuid = "d48b7d99-76e7-47ae-b1d5-ff0c1cf9a818"
version = "0.8.0"

[[deps.XML2_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
Expand Down
2 changes: 1 addition & 1 deletion build/create_binaries/add_metadata.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function add_metadata(project_dir, license_file, output_dir, git_repo)
julia_version = manifest["julia_version"]
wflow_entry = only(manifest["deps"]["Wflow"])
tree = wflow_entry["git-tree-sha1"]
version = wflow_entry["version"]
version = TOML.parsefile(normpath(git_repo, "Project.toml"))["version"]
repo = GitRepo(git_repo)
branch = LibGit2.head(repo)
# commit = LibGit2.peel(LibGit2.GitCommit, branch)
Expand Down
2 changes: 0 additions & 2 deletions build/wflow_cli/Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -639,10 +639,8 @@ version = "0.21.70"
[[deps.Wflow]]
deps = ["BasicModelInterface", "CFTime", "Dates", "DelimitedFiles", "FieldMetadata", "Glob", "Graphs", "IfElse", "LoggingExtras", "LoopVectorization", "NCDatasets", "Parameters", "Polyester", "ProgressLogging", "Random", "StaticArrays", "Statistics", "TOML", "TerminalLoggers", "UnPack"]
git-tree-sha1 = "414d32f07561872f03cb4f347df719962dfddc5e"
repo-rev = "master"
path = "../.."
uuid = "d48b7d99-76e7-47ae-b1d5-ff0c1cf9a818"
version = "0.8.0"

[[deps.XML2_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
Expand Down

0 comments on commit e2fa040

Please sign in to comment.