Fix build script permissions, update build matrix

sintef-ocean · Nov 28, 2023 · cb57900 · cb57900
1 parent 963c920
commit cb57900
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -23,9 +23,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        conan: ["1.0", "2.0"]
+        conan: ["2.0"]
         profile: [gcc]
-        compiler_version: [8, 9, 10, 11, 12]
+        compiler_version: [8, 9, 10, 11, 12, 13]
         build_type: [Debug, Release]
         version: ["6.9.210323"]
         channel: ["${{ (github.head_ref || github.ref_name) == 'master' && 'stable' || 'testing' }}"]

diff --git a/conanfile.py b/conanfile.py
@@ -67,7 +67,6 @@ def export_sources(self):
         copy(self, '*', join(self.recipe_folder, "patches"), join(self.export_sources_folder, "patches"))
         copy(self, '*', join(self.recipe_folder, "setup"), join(self.export_sources_folder, "setup"))
         copy(self, self._build_script, self.recipe_folder, self.export_sources_folder)
-        os.chmod(join(self.export_sources_folder, self._build_script), 0o755)
         copy(self, "OpenSpliceHelpers.cmake", self.recipe_folder, self.export_sources_folder)
 
     def config_options(self):
@@ -170,6 +169,8 @@ def build(self):
         source = self.source_folder
         if self.settings.os == "Windows":
             source = str(source).replace('\\', '/')
+        else:
+            os.chmod(join(self.export_sources_folder, self._build_script), 0o755)
         msvc = "msvc" if is_msvc(self) else ""
 
         self.run(f"./{self._build_script} {source} {self._ospl_platform}-{config} {jobs} {msvc}", cwd=self.export_sources_folder)