Skip to content

Commit

Permalink
Merge branch 'main' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Jul 12, 2024
2 parents 88c5c4f + 8d68c7d commit 7642ef9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .versionDate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-06-24 15:50 -06:00
2024-07-11 16:39 -06:00
3 changes: 2 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
# The short X.Y version.
version = '8.7'
# The full version, including alpha/beta/rc tags.
release = '8.7.43'
release = '8.7.44'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -397,5 +397,6 @@






3 changes: 0 additions & 3 deletions rt/terse_avail/terse_avail.tdesc
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ testdescript = {
remove_generated_lmod_files
cp $(testDir)/.lmodrc.lua .lmodrc.lua
runLmod --version # 1
runLmod load intel # 2
runLmod avail # 3
Expand Down
6 changes: 3 additions & 3 deletions settarg/Version.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ function M.branchStr()
end
return s == "" and s or "[branch: "..s.."]"
end
function M.tag() return "8.7.43" end
function M.tag() return "8.7.44" end
function M.git()
local s = "8.7.43"
local s = "8.7.44"
if (s == "@" .. "git@") then s = "" end
if (s == M.tag() ) then s = "" end
return s == "" and s or "("..s..")"
end
function M.date() return "2024-06-24 15:50 -06:00" end
function M.date() return "2024-07-11 16:39 -06:00" end
function M.name()
local a = {}
a[#a+1] = M.tag()
Expand Down
6 changes: 3 additions & 3 deletions src/Version.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ function M.branchStr()
end
return s == "" and s or "[branch: "..s.."]"
end
function M.tag() return "8.7.43" end
function M.tag() return "8.7.44" end
function M.git()
local s = "8.7.43"
local s = "8.7.44"
if (s == "@" .. "git@") then s = "" end
if (s == M.tag() ) then s = "" end
return s == "" and s or "("..s..")"
end
function M.date() return "2024-06-24 15:50 -06:00" end
function M.date() return "2024-07-11 16:39 -06:00" end
function M.name()
local a = {}
a[#a+1] = M.tag()
Expand Down

0 comments on commit 7642ef9

Please sign in to comment.