From 7a5caf1bd07e99060e1d11a6f117f54ea3f5b39f Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 11:14:37 -0700 Subject: [PATCH 1/7] Update macos.yml use FC variable for cmake in the workflow ci --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cad00deb..4beb8a1b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ jobs: gfortran-14 --version - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: FC=gfortran-14 cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From de9062ccf946d12dacf46c4aa1591e5c820a7a8f Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 11:19:14 -0700 Subject: [PATCH 2/7] recursive clone for submodules --- .github/workflows/macos.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4beb8a1b..db6413ab 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -15,6 +15,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + submodules: recursive - name: Configure system run: | From 33850da4cf95c6927e303154a4f66e59c43ad79e Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 11:28:28 -0700 Subject: [PATCH 3/7] add cmake install --- .github/workflows/macos.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index db6413ab..9f314ade 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -29,6 +29,9 @@ jobs: - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + - name: Install + run: cmake --install + - name: Test working-directory: ${{github.workspace}}/build run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure From 2b900c1fe5278b8c173b95c5959c4ac46439389a Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 11:37:43 -0700 Subject: [PATCH 4/7] add directory to cmake install --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9f314ade..f99c18a0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,7 +30,7 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Install - run: cmake --install + run: cmake --install ${{github.workspace}}/build - name: Test working-directory: ${{github.workspace}}/build From 7d1de2126156d4281fdf2f4236d7d419015526e9 Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 12:04:44 -0700 Subject: [PATCH 5/7] add prefix to install --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f99c18a0..cac72283 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,7 +30,7 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Install - run: cmake --install ${{github.workspace}}/build + run: cmake --install ${{github.workspace}}/build --prefix $HOME/.local - name: Test working-directory: ${{github.workspace}}/build From 3b802f6b68e8e96dabf2b0e4e7688ed4e79c07f9 Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 12:18:24 -0700 Subject: [PATCH 6/7] do plain make install --- .github/workflows/macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cac72283..f3406116 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -24,13 +24,13 @@ jobs: gfortran-14 --version - name: Configure CMake - run: FC=gfortran-14 cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: FC=gfortran-14 cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} --install-prefix=$HOME - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Install - run: cmake --install ${{github.workspace}}/build --prefix $HOME/.local + run: make install # run: cmake --install ${{github.workspace}}/build --prefix $HOME/.local - name: Test working-directory: ${{github.workspace}}/build From 96ab7e3220265fa65922294c8545476300d25d46 Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Tue, 2 Jul 2024 14:02:42 -0700 Subject: [PATCH 7/7] Update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f3406116..d9e0e3d8 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,7 +30,7 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Install - run: make install # run: cmake --install ${{github.workspace}}/build --prefix $HOME/.local + run: make -C ${{github.workspace}}/build install # run: cmake --install ${{github.workspace}}/build --prefix $HOME/.local - name: Test working-directory: ${{github.workspace}}/build