Skip to content

Comments

Add github action for macosx#14738

Closed
slontis wants to merge 1 commit intoopenssl:masterfrom
slontis:github_action_macos
Closed

Add github action for macosx#14738
slontis wants to merge 1 commit intoopenssl:masterfrom
slontis:github_action_macos

Conversation

@slontis
Copy link
Member

@slontis slontis commented Mar 30, 2021

Checklist
  • documentation is added or updated
  • tests are added or updated

@slontis slontis added the branch: master Applies to master branch label Mar 30, 2021
@slontis slontis force-pushed the github_action_macos branch 2 times, most recently from 21d25e4 to c225691 Compare March 30, 2021 05:50
@slontis
Copy link
Member Author

slontis commented Mar 30, 2021

Eventually this could become part of a matrix in CI.yml. But for now just get it to build.. Note that mac consumes lots more minutes resources (10 * ??)..

@levitte
Copy link
Member

levitte commented Mar 30, 2021

Another way would be this:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85fbe952dc..18a700438c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,10 @@ jobs:
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
   minimal:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v2
     - name: config

A positive thing with this is that if it doesn't build on one of the listed operating systems, builds on the remaining ones are automatically cancelled.

@t8m
Copy link
Member

t8m commented Mar 30, 2021

I do not think we would want to run many different builds on MacOSX but the minimal build is really too limited. I suppose doing the basic possibly with an additional install phase would be sufficient?

@levitte
Copy link
Member

levitte commented Mar 30, 2021

I do not think we would want to run many different builds on MacOSX but the minimal build is really too limited. I suppose doing the basic possibly with an additional install phase would be sufficient?

Sounds good to me

@slontis
Copy link
Member Author

slontis commented Mar 30, 2021

I will add it to the out-of-source-and-install

@slontis slontis force-pushed the github_action_macos branch from c225691 to ff340a8 Compare March 30, 2021 23:48
@levitte
Copy link
Member

levitte commented Mar 31, 2021

Do you plan to add it elsewhere in this PR, or is it time for final review?

@slontis
Copy link
Member Author

slontis commented Mar 31, 2021

This looked like a good place to add it - without having too many macos builds being kicked off.
Isnt where I put it now good enough?

@levitte
Copy link
Member

levitte commented Mar 31, 2021

It is good enough

@levitte levitte added the approval: done This pull request has the required number of approvals label Mar 31, 2021
@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically, alternatively please review and set the label manually.

@slontis slontis added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Apr 1, 2021
openssl-machine pushed a commit that referenced this pull request Apr 1, 2021
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #14738)
@slontis
Copy link
Member Author

slontis commented Apr 1, 2021

Thanks for the input.. Merged to master.

@slontis slontis closed this Apr 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants