-
Notifications
You must be signed in to change notification settings - Fork 15
introduces macos and windows runners in build step #279
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bobrossthepainter
wants to merge
20
commits into
master
Choose a base branch
from
build-on-multi-os
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
f74ef50
introduces macos and windows runners in build step
bobrossthepainter 3fd3a1a
removes windows-runner
bobrossthepainter 3634ff4
adds missing docker for macos-run
bobrossthepainter 40f6ee6
fixes mac-os build - docker setup
bobrossthepainter 04bd595
fixes mac-os build - docker setup
bobrossthepainter b312b18
fixes mac-os build - docker setup
bobrossthepainter d870ac0
fixes mac-os build - docker setup
bobrossthepainter f874752
fixes mac-os build - docker setup
bobrossthepainter 9f8bfa9
fixes mac-os build - docker setup
bobrossthepainter f60fcc1
fix mac build
bobrossthepainter 26e1c9d
fix mac build
bobrossthepainter 8e07752
fix mac build
bobrossthepainter a79c1db
fix mac build
bobrossthepainter 506ac25
Merge remote-tracking branch 'origin/master' into build-on-multi-os
bobrossthepainter 6b17bf6
fix mac build
bobrossthepainter ab11f9c
fix mac build
bobrossthepainter 93900e4
fix mac build
bobrossthepainter 61eeb72
fix mac build
bobrossthepainter c2ff2cb
fixes gradle env-var interpretation issue on macos
bobrossthepainter 9150001
Merge branch 'bug/macos_build' into build-on-multi-os
bobrossthepainter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,17 @@ jobs: | |
| - uses: actions/checkout@v3 | ||
| - id: set-matrix | ||
| run: | | ||
| matrix=$( cat k8s-versions.json | jq '{version: [keys[] as $k | .[$k].versions[] | .k8s as $v | "\($k) \($v)"]}' -c ) | ||
| # Full matrix | ||
| # ubuntu_versions=$( cat k8s-versions.json | jq '{version: [keys[] as $k | .[$k].versions[] | .k8s as $v | "\($k) \($v)"], os: ["ubuntu-latest"]}' -c ) | ||
| # macos_versions=$(cat k8s-versions.json | jq '{ version: [to_entries[] as $k | "\($k.key) \($k.value.versions[-1].k8s)"]}') | ||
| # matrix=$( echo $ubuntu_versions | jq --argjson macos_versions "$(echo -n $macos_versions)" '.os as $os | .version as $version | {version: $version, os: $os, include: [{version: $macos_versions.version, os: "macos-13"}]}' -c ) | ||
|
|
||
| # echo $matrix | ||
| # echo "::set-output name=matrix::$matrix" | ||
|
|
||
| # MacOs Single Test | ||
| matrix=$( echo '{"version":["ApiServerContainer 1.30.0"],"os":["macos-12"]}' | jq -c '.') | ||
|
|
||
| echo $matrix | ||
| echo "::set-output name=matrix::$matrix" | ||
|
|
||
|
|
@@ -30,11 +40,24 @@ jobs: | |
| echo $matrix | jq . | ||
|
|
||
| build: | ||
| runs-on: ubuntu-latest | ||
| needs: matrix | ||
| strategy: | ||
| matrix: ${{ fromJson(needs.matrix.outputs.matrix) }} | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Setup docker (missing on MacOS) | ||
| if: runner.os == 'macos' | ||
| run: | | ||
| brew install docker colima docker-buildx | ||
| colima start --network-address | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do you use |
||
| colima ls | ||
| # For testcontainers to find the Colima socket | ||
| # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running | ||
| sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock | ||
|
|
||
| echo "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock" >> $GITHUB_ENV | ||
| echo "TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')" >> $GITHUB_ENV | ||
| # echo "DOCKER_HOST=unix://${HOME}/.colima/default/docker.sock" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v2 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
macos12-runner is deprecated - https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @cmoulliard, thanks almost forgot this PR. I will provide an update here within the next week.