From 68f1401e58caac46cc390358b000a70619000857 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 3 Jun 2024 21:35:08 -0700 Subject: [PATCH 1/2] fix mac ci - debug --- .github/workflows/mac_debug.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/mac_debug.yml b/.github/workflows/mac_debug.yml index 76deafba..bcbff404 100644 --- a/.github/workflows/mac_debug.yml +++ b/.github/workflows/mac_debug.yml @@ -22,11 +22,11 @@ jobs: steps: - - name: uninstall openexr - run: brew uninstall --ignore-dependencies openexr + # - name: uninstall openexr + # run: brew uninstall --ignore-dependencies openexr - - name: uninstall imath - run: brew uninstall --ignore-dependencies imath + # - name: uninstall imath + # run: brew uninstall --ignore-dependencies imath - name: install dependencies - openexr v2.5 run: | @@ -65,7 +65,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -77,7 +77,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -96,11 +96,11 @@ jobs: steps: - - name: uninstall openexr - run: brew uninstall --ignore-dependencies openexr + # - name: uninstall openexr + # run: brew uninstall --ignore-dependencies openexr - - name: uninstall imath - run: brew uninstall --ignore-dependencies imath + # - name: uninstall imath + # run: brew uninstall --ignore-dependencies imath - name: install dependencies - openexr v2.5 run: | @@ -145,7 +145,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -157,7 +157,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 From a9e1d113c0b4d362b8640c10b3e7ba9d5e7c5614 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 3 Jun 2024 21:41:37 -0700 Subject: [PATCH 2/2] fix mac ci - release and debug --- .github/workflows/mac_debug.yml | 4 +-- .github/workflows/mac_release.yml | 44 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/mac_debug.yml b/.github/workflows/mac_debug.yml index bcbff404..4bb40530 100644 --- a/.github/workflows/mac_debug.yml +++ b/.github/workflows/mac_debug.yml @@ -38,7 +38,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -112,7 +112,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml index 865db163..8f5f7454 100644 --- a/.github/workflows/mac_release.yml +++ b/.github/workflows/mac_release.yml @@ -48,11 +48,11 @@ jobs: steps: - - name: uninstall openexr - run: brew uninstall --ignore-dependencies openexr + # - name: uninstall openexr + # run: brew uninstall --ignore-dependencies openexr - - name: uninstall imath - run: brew uninstall --ignore-dependencies imath + # - name: uninstall imath + # run: brew uninstall --ignore-dependencies imath - name: install dependencies - openexr v2.5 run: | @@ -64,7 +64,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -91,7 +91,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -103,7 +103,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -130,7 +130,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=OFF .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -142,7 +142,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=OFF .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -169,7 +169,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=ON .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -181,7 +181,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=ON .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -232,11 +232,11 @@ jobs: steps: - - name: uninstall openexr - run: brew uninstall --ignore-dependencies openexr + # - name: uninstall openexr + # run: brew uninstall --ignore-dependencies openexr - - name: uninstall imath - run: brew uninstall --ignore-dependencies imath + # - name: uninstall imath + # run: brew uninstall --ignore-dependencies imath - name: install dependencies - openexr v2.5 run: | @@ -248,7 +248,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -281,7 +281,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -293,7 +293,7 @@ jobs: cd build && cmake .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -326,7 +326,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=OFF .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -338,7 +338,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=OFF .. && make && - make install + sudo make install - uses: actions/checkout@v3 @@ -371,7 +371,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=ON .. && make && - make install + sudo make install - name: install dependencies - openexr v3.1 run: | @@ -383,7 +383,7 @@ jobs: cd build && cmake -DBUILD_SHARED_LIBS=ON .. && make && - make install + sudo make install - uses: actions/checkout@v3