From b956c5a43fa806390edb032b14b0b40322c1d382 Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 08:16:21 +0200 Subject: [PATCH 1/7] Test CI with 2 jobs --- .../{check-magix3d.yml => check-push.yml} | 29 +++++++++++++++++-- .github/workflows/check-recipes-style.yml | 28 ------------------ meshing_supersede/packages/cgal/package.py | 2 +- .../packages/omniorb-anl/package.py | 11 +++---- 4 files changed, 33 insertions(+), 37 deletions(-) rename .github/workflows/{check-magix3d.yml => check-push.yml} (60%) delete mode 100644 .github/workflows/check-recipes-style.yml diff --git a/.github/workflows/check-magix3d.yml b/.github/workflows/check-push.yml similarity index 60% rename from .github/workflows/check-magix3d.yml rename to .github/workflows/check-push.yml index 9856106..978d3df 100644 --- a/.github/workflows/check-magix3d.yml +++ b/.github/workflows/check-push.yml @@ -1,11 +1,34 @@ -name: Check magix3d +name: Check push on: [push, pull_request] jobs: - main: - name: ${{ matrix.config }} + lint: + name: Lint Recipes + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Flake8 on meshing + uses: py-actions/flake8@v2 + with: + ignore: "E501,F405,F403" + path: "meshing" + + - name: Flake8 on meshing_supersede + uses: py-actions/flake8@v2 + with: + ignore: "E501,F405,F403" + path: "meshing_supersede" + + magix3d: + name: Install Magix3D runs-on: ubuntu-latest container: image: ghcr.io/lihpc-computational-geometry/spack-cgcore:latest diff --git a/.github/workflows/check-recipes-style.yml b/.github/workflows/check-recipes-style.yml deleted file mode 100644 index 6e6fc4e..0000000 --- a/.github/workflows/check-recipes-style.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: 'Check recipes style' - -on: - workflow_dispatch - -jobs: - main: - name: Check recipes style - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Flake8 lint on meshing - uses: py-actions/flake8@v2 - with: - ignore: "E501,F405,F403" - path: "meshing" - - - name: Flake8 lint on meshing_supersede - uses: py-actions/flake8@v2 - with: - ignore: "E501,F405,F403" - path: "meshing_supersede" diff --git a/meshing_supersede/packages/cgal/package.py b/meshing_supersede/packages/cgal/package.py index 0adcd6f..edb7029 100644 --- a/meshing_supersede/packages/cgal/package.py +++ b/meshing_supersede/packages/cgal/package.py @@ -104,7 +104,7 @@ def cmake_args(self): # Installation instructions: # https://doc.cgal.org/latest/Manual/installation.html spec = self.spec - variant_bool = lambda feature: str(feature in spec) + def variant_bool(feature): str(feature in spec) cmake_args = [] cmake_args.append("-DBUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared")) diff --git a/meshing_supersede/packages/omniorb-anl/package.py b/meshing_supersede/packages/omniorb-anl/package.py index 12c4ff9..5b56c5f 100644 --- a/meshing_supersede/packages/omniorb-anl/package.py +++ b/meshing_supersede/packages/omniorb-anl/package.py @@ -39,21 +39,22 @@ # from spack import * + # -# omniORB 4.1.7 de ATT tres legerement retouche pour qu'il puisse s'installe dans +# omniORB 4.1.7 de ATT tres legerement retouche pour qu'il puisse s'installe dans # un environnement spack (de base il y a un probleme de shebang ...) # class OmniorbAnl(AutotoolsPackage): """ORB de ATT""" homepage = "" - url = "omniorb-anl-4.1.7.tar.gz" + url = "omniorb-anl-4.1.7.tar.gz" version('4.1.7', sha256='3f42d97cb0344afb25c3b203ec874ad3d2ea944ea75a16bcb5e084c66273691d') version('4.3.0') - # On a besoin de 2.7 <= python < 3.0.0 : -# depends_on('python@2.7:', type=('link')) -# depends_on('python@:2.7.16', type=('build', 'link')) + # On a besoin de 2.7 <= python < 3.0.0 : + # depends_on('python@2.7:', type=('link')) + # depends_on('python@:2.7.16', type=('build', 'link')) depends_on('python@:2.7.16', type='run', when="@:4.2.99") depends_on('python@3:', type='run', when="@4.3.0:") From 151b0a647ee2a1c6b721b2b49cc40c35e1886b4a Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 08:24:49 +0200 Subject: [PATCH 2/7] Fix condition on second job --- .github/workflows/check-push.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-push.yml b/.github/workflows/check-push.yml index 978d3df..6ce233c 100644 --- a/.github/workflows/check-push.yml +++ b/.github/workflows/check-push.yml @@ -12,7 +12,7 @@ jobs: packages: write steps: - - name: Checkout repository + - name: Checkout Repository uses: actions/checkout@v4 - name: Flake8 on meshing @@ -30,25 +30,27 @@ jobs: magix3d: name: Install Magix3D runs-on: ubuntu-latest + needs: [lint] container: image: ghcr.io/lihpc-computational-geometry/spack-cgcore:latest strategy: fail-fast: false steps: - - uses: actions/checkout@v4 + - name: Checkout Repository + uses: actions/checkout@v4 with: fetch-depth: 2 # seems to be needed by codecov submodules: recursive - - name: Initialize the environment + - name: Initialize Spack Environment shell: bash run: | source /spack/share/spack/setup-env.sh spack repo add $GITHUB_WORKSPACE/meshing spack repo add $GITHUB_WORKSPACE/meshing_supersede - - name: Build and install + - name: Spack Install Magix3D shell: bash run: | source /spack/share/spack/setup-env.sh From 5770dfc6397e38342f64fb993c52e0b92d3f8b6d Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 08:30:37 +0200 Subject: [PATCH 3/7] Fix linter errors --- meshing_supersede/packages/cgal/package.py | 3 ++- .../packages/opencascade/package.py | 21 ++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/meshing_supersede/packages/cgal/package.py b/meshing_supersede/packages/cgal/package.py index edb7029..915b332 100644 --- a/meshing_supersede/packages/cgal/package.py +++ b/meshing_supersede/packages/cgal/package.py @@ -104,7 +104,8 @@ def cmake_args(self): # Installation instructions: # https://doc.cgal.org/latest/Manual/installation.html spec = self.spec - def variant_bool(feature): str(feature in spec) + def variant_bool(feature): + str(feature in spec) cmake_args = [] cmake_args.append("-DBUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared")) diff --git a/meshing_supersede/packages/opencascade/package.py b/meshing_supersede/packages/opencascade/package.py index 876b6c2..6c18b85 100755 --- a/meshing_supersede/packages/opencascade/package.py +++ b/meshing_supersede/packages/opencascade/package.py @@ -15,11 +15,11 @@ class Opencascade(CMakePackage): ############################################## -# WARNING this supersedes the upstream recipe +# WARNING this supersedes the upstream recipe ############################################## homepage = "https://www.opencascade.com" - url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_1_0;sf=tgz" + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_1_0;sf=tgz" # version('7.4.0', extension='tar.gz', # sha256='1eace85115ea178f268e9d803ced994b66b72455b5484074b6ad7f643261f0a0') @@ -38,7 +38,7 @@ def url_for_version(self, version): # modifications for internal use patch('opencascade-7.1.0_a.patch', when='@7.1.0') - + variant('tbb', default=False, description='Build with Intel Threading Building Blocks') variant('vtk', default=False, @@ -60,14 +60,13 @@ def url_for_version(self, version): variant('draw', default=False, description='Sets BUILD_MODULE_Draw') variant('foundationclasses', default=False, - description='Sets BUILD_MODULE_FoundationClasses (probably always ON)' ) + description='Sets BUILD_MODULE_FoundationClasses (probably always ON)') variant('modelingalgorithm', default=False, description='Sets BUILD_MODULE_ModelingAlgorithm') variant('modelingdata', default=False, description='Sets BUILD_MODULE_ModelingData') variant('visualization', default=False, description='Sets BUILD_MODULE_Visualization') - depends_on('intel-tbb', when='+tbb') depends_on('vtk', when='+vtk') @@ -76,7 +75,6 @@ def url_for_version(self, version): depends_on('gl2ps', when='@7.1.0+gl2ps') depends_on('doxygen', when='+documentation') - depends_on('freetype') depends_on('tcl') @@ -87,11 +85,11 @@ def url_for_version(self, version): depends_on('gl') - # those two libraries are always used at link phase, but it could be a - # remnant of the optionnal gl2ps module. We might be able to remove + # those two libraries are always used at link phase, but it could be a + # remnant of the optionnal gl2ps module. We might be able to remove # those dependencies in a future release of OCC. - depends_on('libxmu', type=('build','link')) - depends_on('libxi', type=('build','link')) + depends_on('libxmu', type=('build', 'link')) + depends_on('libxi', type=('build', 'link')) def cmake_args(self): args = [] @@ -131,7 +129,6 @@ def cmake_args(self): else: args.append('-DUSE_GL2PS=OFF') - if '+documentation' in self.spec: args.append('-DBUILD_DOC_Overview=ON') else: @@ -151,7 +148,7 @@ def cmake_args(self): args.append('-DBUILD_MODULE_Draw=ON') else: args.append('-DBUILD_MODULE_Draw=OFF') - + if '+foundationclasses' in self.spec: args.append('-DBUILD_MODULE_FoundationClasses=ON') else: From 06a0441ac97e6b0b1c1c6a79181e6656d133c712 Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 10:11:31 +0200 Subject: [PATCH 4/7] Merge CIs --- .github/workflows/check-push.yml | 50 +++++++++++++++++++----- .github/workflows/check-spec-magix3d.yml | 35 ----------------- 2 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 .github/workflows/check-spec-magix3d.yml diff --git a/.github/workflows/check-push.yml b/.github/workflows/check-push.yml index 6ce233c..0f90b07 100644 --- a/.github/workflows/check-push.yml +++ b/.github/workflows/check-push.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: - lint: + lint-recipes: name: Lint Recipes runs-on: ubuntu-latest permissions: @@ -24,18 +24,50 @@ jobs: - name: Flake8 on meshing_supersede uses: py-actions/flake8@v2 with: - ignore: "E501,F405,F403" + ignore: "E501,F405,F403,W504" path: "meshing_supersede" - magix3d: - name: Install Magix3D + spack-spec-mgx3d: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Linux, Windows or Mac. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + name: Check Magix3D + runs-on: ubuntu-latest + needs: [lint-recipes] + strategy: + fail-fast: false + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + fetch-depth: 2 # seems to be needed by codecov + submodules: recursive + + - name: Initialize Spack environment + shell: bash + run: | + git clone --depth=1 -b releases/latest https://github.com/spack/spack.git ${{github.workspace}}/spack + source ${{github.workspace}}/spack/share/spack/setup-env.sh + spack repo add ${{github.workspace}}/meshing + spack repo add ${{github.workspace}}/meshing_supersede + + - name: Check Spack spec + # We create a subdirectory that will stand as our working directory for all + # subsequent commands + run: | + source ${{github.workspace}}/spack/share/spack/setup-env.sh + spack spec magix3d~smooth3d~pythonaddon+doc ^vtk-maillage~opengl2+qt ^qt+opengl + + spack-install-mgx3d: + name: Spack Install Magix3D runs-on: ubuntu-latest - needs: [lint] + needs: [spack-spec-mgx3d] container: image: ghcr.io/lihpc-computational-geometry/spack-cgcore:latest strategy: fail-fast: false - + steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -47,10 +79,10 @@ jobs: shell: bash run: | source /spack/share/spack/setup-env.sh - spack repo add $GITHUB_WORKSPACE/meshing - spack repo add $GITHUB_WORKSPACE/meshing_supersede + spack repo add ${{github.workspace}}/meshing + spack repo add ${{github.workspace}}/meshing_supersede - - name: Spack Install Magix3D + - name: Build and Install Magix3D shell: bash run: | source /spack/share/spack/setup-env.sh diff --git a/.github/workflows/check-spec-magix3d.yml b/.github/workflows/check-spec-magix3d.yml deleted file mode 100644 index 6ed579f..0000000 --- a/.github/workflows/check-spec-magix3d.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Check spec magix3d - -on: - [push, pull_request] - -jobs: - main: - name: ${{ matrix.config }} - # The CMake configure and build commands are platform agnostic and should work equally - # well on Linux, Windows or Mac. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-latest - strategy: - fail-fast: false - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 2 # seems to be needed by codecov - submodules: recursive - - - name: Initialize the environment - shell: bash - run: | - git clone --depth=1 -b releases/latest https://github.com/spack/spack.git ${{github.workspace}}/spack - source ${{github.workspace}}/spack/share/spack/setup-env.sh - spack repo add ${{github.workspace}}/meshing - spack repo add ${{github.workspace}}/meshing_supersede - - - name: Check Spack spec - # We create a subdirectory that will stand as our working directory for all - # subsequent commands - run: | - source ${{github.workspace}}/spack/share/spack/setup-env.sh - spack spec magix3d~smooth3d~pythonaddon+doc ^vtk-maillage~opengl2+qt ^qt+opengl From ac74a2d31f0e0b6c1367117c49264a3157a0f74a Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 10:11:44 +0200 Subject: [PATCH 5/7] Fix linter errors on recipes --- meshing_supersede/packages/cgal/package.py | 1 + .../packages/vtk-maillage/package.py | 88 +++++++++---------- 2 files changed, 42 insertions(+), 47 deletions(-) diff --git a/meshing_supersede/packages/cgal/package.py b/meshing_supersede/packages/cgal/package.py index 915b332..d43750d 100644 --- a/meshing_supersede/packages/cgal/package.py +++ b/meshing_supersede/packages/cgal/package.py @@ -104,6 +104,7 @@ def cmake_args(self): # Installation instructions: # https://doc.cgal.org/latest/Manual/installation.html spec = self.spec + def variant_bool(feature): str(feature in spec) cmake_args = [] diff --git a/meshing_supersede/packages/vtk-maillage/package.py b/meshing_supersede/packages/vtk-maillage/package.py index 1078346..60e0c56 100755 --- a/meshing_supersede/packages/vtk-maillage/package.py +++ b/meshing_supersede/packages/vtk-maillage/package.py @@ -5,7 +5,6 @@ import os -import sys from spack import * @@ -16,27 +15,27 @@ class VtkMaillage(CMakePackage): processing and visualization. """ homepage = "http://www.vtk.org" - url = 'https://vtk.org/files/release/7.1/VTK-7.1.1.tar.gz' # VTK-7.1.1.tar.gz + url = 'https://vtk.org/files/release/7.1/VTK-7.1.1.tar.gz' # VTK7 defaults to OpenGL2 rendering backend variant('opengl2', default=True, description='Enable OpenGL2 backend') variant('osmesa', default=False, description='Enable OSMesa support') -# variant('python', default=False, description='Enable Python support') + # variant('python', default=False, description='Enable Python support') variant('qt', default=False, description='Build with support for Qt') -# variant('xdmf', default=False, description='Build XDMF file support') -# variant('ffmpeg', default=False, description='Build with FFMPEG support') + # variant('xdmf', default=False, description='Build XDMF file support') + # variant('ffmpeg', default=False, description='Build with FFMPEG support') variant('mpi', default=True, description='Enable MPI support') # At the moment, we cannot build with both osmesa and qt, but as of # VTK 8.1, that should change -# conflicts('+osmesa', when='+qt') + # conflicts('+osmesa', when='+qt') # The use of the OpenGL2 backend requires at least OpenGL Core Profile # version 3.2 or higher. depends_on('gl@3.2:', when='+opengl2') depends_on('gl@1.2:', when='~opengl2') - # Note: it is recommended to use mesa+llvm, if possible. + # Note: it is recommended to use mesa+llvm, if possible. # mesa default is software rendering, llvm makes it faster depends_on('mesa+osmesa', when='+osmesa') @@ -55,29 +54,26 @@ class VtkMaillage(CMakePackage): depends_on('mpi', when='+mpi') -# depends_on('ffmpeg', when='+ffmpeg') - + # depends_on('ffmpeg', when='+ffmpeg') depends_on('expat') depends_on('freetype') depends_on('glew') -# depends_on('hdf5') + # depends_on('hdf5') depends_on('jpeg') -# depends_on('jsoncpp') -# depends_on('libxml2') -# depends_on('lz4') -# depends_on('netcdf') -# depends_on('netcdf-cxx') + # depends_on('jsoncpp') + # depends_on('libxml2') + # depends_on('lz4') + # depends_on('netcdf') + # depends_on('netcdf-cxx') depends_on('libpng') depends_on('libtiff') depends_on('zlib') - # def url_for_version(self, version): - # url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" - # return url.format(version.up_to(2), version) - + # def url_for_version(self, version): + # url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" + # return url.format(version.up_to(2), version) version('7.1.1', sha256='2d5cdd048540144d821715c718932591418bb48f5b6bb19becdae62339efa75a') - def setup_environment(self, spack_env, run_env): # VTK has some trouble finding freetype unless it is set in # the environment @@ -94,8 +90,8 @@ def cmake_args(self): # In general, we disable use of VTK "ThirdParty" libs, preferring # spack-built versions whenever possible -# '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON', - '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF', # CP + # '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON', + '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=OFF', # CP # However, in a few cases we can't do without them yet '-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF', @@ -103,12 +99,12 @@ def cmake_args(self): '-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF', '-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF', -# '-DNETCDF_DIR={0}'.format(spec['netcdf'].prefix), -# '-DNETCDF_C_ROOT={0}'.format(spec['netcdf'].prefix), -# '-DNETCDF_CXX_ROOT={0}'.format(spec['netcdf-cxx'].prefix), + # '-DNETCDF_DIR={0}'.format(spec['netcdf'].prefix), + # '-DNETCDF_C_ROOT={0}'.format(spec['netcdf'].prefix), + # '-DNETCDF_CXX_ROOT={0}'.format(spec['netcdf-cxx'].prefix), # Allow downstream codes (e.g. VisIt) to override VTK's classes -# '-DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON', # CP + # '-DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON', # CP # Disable wrappers for other languages. '-DVTK_WRAP_JAVA=OFF', @@ -144,15 +140,15 @@ def cmake_args(self): # NOTE: The following definitions are required in order to allow # VTK to build with qt~webkit versions (see the documentation for # more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup). -# CP comments -# if '~webkit' in spec['qt']: -# cmake_args.extend([ -# '-DVTK_Group_Qt:BOOL=OFF', -# '-DModule_vtkGUISupportQt:BOOL=ON', -# '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', -# ]) - -# CP ADDON FLAGS : + # CP comments + # if '~webkit' in spec['qt']: + # cmake_args.extend([ + # '-DVTK_Group_Qt:BOOL=OFF', + # '-DModule_vtkGUISupportQt:BOOL=ON', + # '-DModule_vtkGUISupportQtOpenGL:BOOL=ON', + # ]) + + # CP ADDON FLAGS : cmake_args.extend([ "-DBUILD_SHARED_LIBS:BOOL=ON", "-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON", @@ -166,9 +162,9 @@ def cmake_args(self): "-DVTK_Group_Imaging:BOOL=ON", "-DVTK_Group_Rendering:BOOL=ON", "-DVTK_ALL_NEW_OBJECT_FACTORY=OFF", -# "-DVTK_QT_VERSION=5", + # "-DVTK_QT_VERSION=5", "-DVTK_USE_SYSTEM_NETCDF=OFF", -# "-DNETCDF_ENABLE_CXX=OFF", + # "-DNETCDF_ENABLE_CXX=OFF", ]) if '+mpi' in spec: cmake_args.extend([ @@ -182,7 +178,7 @@ def cmake_args(self): "-DModule_vtkFiltersParallelMPI:BOOL=OFF", "-DModule_vtkRenderingParallel:BOOL=OFF" ]) -# !CP ADDON FLAGS + # !CP ADDON FLAGS if '+xdmf' in spec: if spec.satisfies('^cmake@3.12:'): @@ -247,12 +243,12 @@ def cmake_args(self): # NETCDF_CXX_ROOT to detect NetCDF C++ bindings, so # NETCDF_CXX_INCLUDE_DIR and NETCDF_CXX_LIBRARY must be # used instead to detect these bindings -# netcdf_cxx_lib = spec['netcdf-cxx'].libs.joined() -# cmake_args.extend([ -# '-DNETCDF_CXX_INCLUDE_DIR={0}'.format( -# spec['netcdf-cxx'].prefix.include), -# '-DNETCDF_CXX_LIBRARY={0}'.format(netcdf_cxx_lib), -# ]) + # netcdf_cxx_lib = spec['netcdf-cxx'].libs.joined() + # cmake_args.extend([ + # '-DNETCDF_CXX_INCLUDE_DIR={0}'.format( + # spec['netcdf-cxx'].prefix.include), + # '-DNETCDF_CXX_LIBRARY={0}'.format(netcdf_cxx_lib), + # ]) # Garbage collection is unsupported in Xcode starting with # version 5.1; if the Apple clang version of the compiler @@ -262,9 +258,7 @@ def cmake_args(self): # string. This fix was recommended on the VTK mailing list # in March 2014 (see # https://public.kitware.com/pipermail/vtkusers/2014-March/083368.html) - if (self.spec.satisfies('%clang') and - self.compiler.is_apple and - self.compiler.version >= Version('5.1.0')): + if (self.spec.satisfies('%clang') and self.compiler.is_apple and self.compiler.version >= Version('5.1.0')): cmake_args.extend(['-DVTK_REQUIRED_OBJCXX_FLAGS=']) # A bug in tao pegtl causes build failures with intel compilers From 31e50d3693404b1258811bbb6768faaaadece94c Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 10:13:55 +0200 Subject: [PATCH 6/7] Change job name --- .github/workflows/check-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-push.yml b/.github/workflows/check-push.yml index 0f90b07..385295c 100644 --- a/.github/workflows/check-push.yml +++ b/.github/workflows/check-push.yml @@ -31,7 +31,7 @@ jobs: # The CMake configure and build commands are platform agnostic and should work equally # well on Linux, Windows or Mac. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - name: Check Magix3D + name: Spack Spec Magix3D runs-on: ubuntu-latest needs: [lint-recipes] strategy: From 54d5e6a8c1119638736fa940fdfa089999f495ed Mon Sep 17 00:00:00 2001 From: Benoit LELANDAIS Date: Fri, 9 Aug 2024 10:45:08 +0200 Subject: [PATCH 7/7] Do not replace $GITHUB_WORKSPACE by ${{github.workspace}} --- .github/workflows/check-push.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-push.yml b/.github/workflows/check-push.yml index 385295c..9f6e226 100644 --- a/.github/workflows/check-push.yml +++ b/.github/workflows/check-push.yml @@ -60,6 +60,8 @@ jobs: spack spec magix3d~smooth3d~pythonaddon+doc ^vtk-maillage~opengl2+qt ^qt+opengl spack-install-mgx3d: + # Do not replace $GITHUB_WORKSPACE by ${{github.workspace}} + # See https://github.com/actions/runner/issues/2058 name: Spack Install Magix3D runs-on: ubuntu-latest needs: [spack-spec-mgx3d] @@ -79,8 +81,8 @@ jobs: shell: bash run: | source /spack/share/spack/setup-env.sh - spack repo add ${{github.workspace}}/meshing - spack repo add ${{github.workspace}}/meshing_supersede + spack repo add $GITHUB_WORKSPACE/meshing + spack repo add $GITHUB_WORKSPACE/meshing_supersede - name: Build and Install Magix3D shell: bash