-
Notifications
You must be signed in to change notification settings - Fork 743
Darwin build #3763
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
Merged
Merged
Darwin build #3763
Changes from all commits
Commits
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
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
2 changes: 2 additions & 0 deletions
2
cmd/nerdctl/completion/completion_freebsd.go → ...ctl/completion/completion_unix_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build unix && !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
2 changes: 2 additions & 0 deletions
2
...nerdctl/container/container_cp_freebsd.go → ...nerdctl/container/container_cp_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
...erdctl/container/container_run_windows.go → ...erdctl/container/container_run_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
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
2 changes: 2 additions & 0 deletions
2
pkg/buildkitutil/buildkitutil_freebsd.go → ...buildkitutil/buildkitutil_unix_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build unix && !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
2 changes: 2 additions & 0 deletions
2
pkg/cmd/container/exec_freebsd.go → pkg/cmd/container/exec_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
pkg/cmd/container/run_freebsd.go → pkg/cmd/container/run_unix_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build unix && !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
2 changes: 2 additions & 0 deletions
2
pkg/cmd/container/stats_freebsd.go → pkg/cmd/container/stats_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
pkg/cmd/namespace/namespace_freebsd.go → pkg/cmd/namespace/namespace_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
...erinspector/containerinspector_freebsd.go → ...pector/containerinspector_unix_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build unix && !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package mountutil | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| "github.com/containerd/containerd/v2/pkg/oci" | ||
| "github.com/containerd/errdefs" | ||
| "github.com/containerd/log" | ||
|
|
||
| "github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore" | ||
| ) | ||
|
|
||
| const ( | ||
| DefaultMountType = "" | ||
|
|
||
| DefaultPropagationMode = "" | ||
| ) | ||
|
|
||
| func UnprivilegedMountFlags(path string) ([]string, error) { | ||
| m := []string{} | ||
| return m, nil | ||
| } | ||
|
|
||
| // parseVolumeOptions parses specified optsRaw with using information of | ||
| // the volume type and the src directory when necessary. | ||
| func parseVolumeOptions(vType, src, optsRaw string) ([]string, []oci.SpecOpts, error) { | ||
| var writeModeRawOpts []string | ||
| for _, opt := range strings.Split(optsRaw, ",") { | ||
| switch opt { | ||
| case "rw": | ||
| writeModeRawOpts = append(writeModeRawOpts, opt) | ||
| case "ro": | ||
| writeModeRawOpts = append(writeModeRawOpts, opt) | ||
| case "": | ||
| // NOP | ||
| default: | ||
| log.L.Warnf("unsupported volume option %q", opt) | ||
| } | ||
| } | ||
| var opts []string | ||
| if len(writeModeRawOpts) > 1 { | ||
| return nil, nil, fmt.Errorf("duplicated read/write volume option: %+v", writeModeRawOpts) | ||
| } else if len(writeModeRawOpts) > 0 && writeModeRawOpts[0] == "ro" { | ||
| opts = append(opts, "ro") | ||
| } // No need to return option when "rw" | ||
| return opts, nil, nil | ||
| } | ||
|
|
||
| func ProcessFlagTmpfs(s string) (*Processed, error) { | ||
| return nil, errdefs.ErrNotImplemented | ||
| } | ||
|
|
||
| func ProcessFlagMount(s string, volStore volumestore.VolumeStore) (*Processed, error) { | ||
| return nil, errdefs.ErrNotImplemented | ||
| } |
2 changes: 2 additions & 0 deletions
2
pkg/ocihook/ocihook_freebsd.go → pkg/ocihook/ocihook_nolinux.go
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| //go:build !linux | ||
|
|
||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
Why ubuntu?
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.
It just selects a runner. I always was under impression than Linux runner are faster and more available on GitHub Actions. Also, Ubuntu runner is used for Windows lint in this file.
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.
We use ubuntu for windows because something is botched wrt Makefile path when on windows...
Will move it to macos-15 - the point is not so much speed here, but verifying that the tooling itself actually works on the target platform.
Making things a bit more clear here: 9c83660
But yeah, it's a detail..