increase intel installation action timeout

fortran-lang · Dec 13, 2023 · 7b7afc2 · 7b7afc2
1 parent fac15ee
commit 7b7afc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml
@@ -112,7 +112,7 @@ jobs:
 
     - name: (Ubuntu) Install Intel oneAPI
       if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
-      timeout-minutes: 5
+      timeout-minutes: 15
       run: sudo apt-get install intel-hpckit ninja-build
 
     - name: (Ubuntu) Setup Intel oneAPI environment

diff --git a/src/fpm_meta.f90 b/src/fpm_meta.f90
@@ -1620,8 +1620,7 @@ logical function is_link_argument(compiler,string)
                              .or. (str_begins_with_str(string,'-W') .and. &
                                    (string/='-Wall') .and. (.not.str_begins_with_str(string,'-Werror'))) ) &
                              .and. .not. ( &
-                                 (get_os_type()==OS_MACOS .and. index(string,'-commons,use_dylibs')>0) &
-                             )
+                                 (get_os_type()==OS_MACOS .and. index(string,'-commons,use_dylibs')>0) )
    end select
 
 end function is_link_argument