diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 15:30:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 15:30:06 +0100 |
| commit | e3f0b7db7508f1e1ecfdb23adb53531c89a29b99 (patch) | |
| tree | c14bd42ae7fe6fd90679455efe932bd37d1f7a24 /hack | |
| parent | 1316b2927be632ff717d9f7fd6a1633198c1ccaf (diff) | |
| parent | f62a356515e387b0bbcf1f08b4831d139c2039b7 (diff) | |
| download | podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.gz podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.bz2 podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.zip | |
Merge pull request #8400 from rhatdan/varlink
Remove varlink support from podman
Diffstat (limited to 'hack')
| -rwxr-xr-x | hack/golangci-lint.sh | 4 | ||||
| -rwxr-xr-x | hack/xref-helpmsgs-manpages | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh index 03c29c89a..50bf29bb8 100755 --- a/hack/golangci-lint.sh +++ b/hack/golangci-lint.sh @@ -6,8 +6,8 @@ set -e declare -A BUILD_TAGS # TODO: add systemd tag BUILD_TAGS[default]="apparmor,seccomp,selinux" -BUILD_TAGS[abi]="${BUILD_TAGS[default]},varlink,!remoteclient" -BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote,varlink,remoteclient" +BUILD_TAGS[abi]="${BUILD_TAGS[default]},!remoteclient" +BUILD_TAGS[tunnel]="${BUILD_TAGS[default]},remote,remoteclient" declare -A SKIP_DIRS SKIP_DIRS[abi]="" diff --git a/hack/xref-helpmsgs-manpages b/hack/xref-helpmsgs-manpages index 55c8b6582..08e56c77e 100755 --- a/hack/xref-helpmsgs-manpages +++ b/hack/xref-helpmsgs-manpages @@ -176,9 +176,6 @@ sub xref_by_man { # Special case: weirdness with Cobra and global/local options next if $k eq '--namespace' && $man =~ /-ps/; - # Special case: these require compiling with 'varlink' tag, - # which doesn't happen in CI gating task. - next if $k eq 'varlink'; next if "@subcommand" eq 'system' && $k eq 'service'; # Special case: podman completion is a hidden command |