From deeeb86067fea01262303e2944fc1043a3e82708 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 28 Aug 2023 15:48:13 +0200 Subject: [PATCH] Fix a few issues with git versions / moving targets in packages (#39635) --- var/spack/repos/builtin/packages/amrvis/package.py | 2 +- var/spack/repos/builtin/packages/bricks/package.py | 1 + var/spack/repos/builtin/packages/chombo/package.py | 2 +- var/spack/repos/builtin/packages/cloverleaf/package.py | 2 +- var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py | 4 ++-- var/spack/repos/builtin/packages/mesa/package.py | 2 +- var/spack/repos/builtin/packages/sse2neon/package.py | 4 ++++ var/spack/repos/builtin/packages/vifi/package.py | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/amrvis/package.py b/var/spack/repos/builtin/packages/amrvis/package.py index 88be340a38..ba25d7dff9 100644 --- a/var/spack/repos/builtin/packages/amrvis/package.py +++ b/var/spack/repos/builtin/packages/amrvis/package.py @@ -18,7 +18,7 @@ class Amrvis(MakefilePackage): maintainers("etpalmer63") - version("main", tag="main") + version("main", branch="main") variant( "dims", diff --git a/var/spack/repos/builtin/packages/bricks/package.py b/var/spack/repos/builtin/packages/bricks/package.py index be5023304e..ccbaccdf51 100644 --- a/var/spack/repos/builtin/packages/bricks/package.py +++ b/var/spack/repos/builtin/packages/bricks/package.py @@ -24,6 +24,7 @@ class Bricks(CMakePackage): maintainers("ztuowen", "drhansj") version("r0.1", branch="r0.1") + version("2023.08.25", commit="d81725055c117c4b63a1b3835c6b634768b5bea7") # no official release variant("cuda", default=False, description="Build bricks with CUDA enabled") diff --git a/var/spack/repos/builtin/packages/chombo/package.py b/var/spack/repos/builtin/packages/chombo/package.py index d0e4f9a301..c3365fa5fa 100644 --- a/var/spack/repos/builtin/packages/chombo/package.py +++ b/var/spack/repos/builtin/packages/chombo/package.py @@ -21,7 +21,7 @@ class Chombo(MakefilePackage): # Use whatever path Brian V. and Terry L. agreed upon, but preserve version version("3.2", commit="71d856c") - version("develop", tag="master") + version("develop", branch="master") variant("mpi", default=True, description="Enable MPI parallel support") variant("hdf5", default=True, description="Enable HDF5 support") diff --git a/var/spack/repos/builtin/packages/cloverleaf/package.py b/var/spack/repos/builtin/packages/cloverleaf/package.py index 847f87b700..e30667b37a 100644 --- a/var/spack/repos/builtin/packages/cloverleaf/package.py +++ b/var/spack/repos/builtin/packages/cloverleaf/package.py @@ -19,7 +19,7 @@ class Cloverleaf(MakefilePackage): tags = ["proxy-app"] - version("master", tag="master", submodules=True) + version("master", branch="master", submodules=True) version("1.1", sha256="de87f7ee6b917e6b3d243ccbbe620370c62df890e3ef7bdbab46569b57be132f") variant( diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py index cec56554ed..930e9e7077 100644 --- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py @@ -15,8 +15,8 @@ class LlvmOpenmpOmpt(CMakePackage): homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp" git = "https://github.com/OpenMPToolsInterface/LLVM-openmp.git" - # tr6_forwards branch - version("tr6_forwards", branch="tr6_forwards") + # tr6_forwards branch (last commit from 2017) + version("tr6_forwards", commit="4b29de49ce90cfb5c3cbc6bb7d91660b70bddb5d") version("3.9.2b2", commit="5cdca5dd3c0c336d42a335ca7cff622e270c9d47") # align-to-tr-rebased branch diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py index 560fd10dac..60fb95beb6 100644 --- a/var/spack/repos/builtin/packages/mesa/package.py +++ b/var/spack/repos/builtin/packages/mesa/package.py @@ -18,7 +18,7 @@ class Mesa(MesonPackage): git = "https://gitlab.freedesktop.org/mesa/mesa.git" url = "https://archive.mesa3d.org/mesa-20.2.1.tar.xz" - version("main", tag="main") + version("main", branch="main") version( "23.0.3", diff --git a/var/spack/repos/builtin/packages/sse2neon/package.py b/var/spack/repos/builtin/packages/sse2neon/package.py index 1192cf8da6..4ad9562126 100644 --- a/var/spack/repos/builtin/packages/sse2neon/package.py +++ b/var/spack/repos/builtin/packages/sse2neon/package.py @@ -13,8 +13,12 @@ class Sse2neon(Package): homepage = "https://github.com/DLTcollab/sse2neon" git = "https://github.com/DLTcollab/sse2neon.git" + url = "https://github.com/DLTcollab/sse2neon/archive/refs/tags/v1.6.0.tar.gz" version("master", branch="master") + version("1.6.0", sha256="06f4693219deccb91b457135d836fc514a1c0a57e9fa66b143982901d2d19677") + version("1.5.1", sha256="4001e2dfb14fcf3831211581ed83bcc83cf6a3a69f638dcbaa899044a351bb2a") + version("1.5.0", sha256="92ab852aac6c8726a615f77438f2aa340f168f9f6e70c72033d678613e97b65a") def install(self, spec, prefix): mkdirp(prefix.include) diff --git a/var/spack/repos/builtin/packages/vifi/package.py b/var/spack/repos/builtin/packages/vifi/package.py index db5acababf..d5d26aedfe 100644 --- a/var/spack/repos/builtin/packages/vifi/package.py +++ b/var/spack/repos/builtin/packages/vifi/package.py @@ -13,7 +13,7 @@ class Vifi(Package): homepage = "https://github.com/namphuon/ViFi" git = "https://github.com/namphuon/ViFi.git" - version("master", tag="master") + version("master", branch="master") depends_on("perl", type="run") depends_on("python", type="run")