Skip to content

Commit

Permalink
Merge pull request #2344 from kolyshkin/no-dm
Browse files Browse the repository at this point in the history
Makefile,.golangci.yml: rm exclude_graphdriver_devicemapper
  • Loading branch information
openshift-merge-bot[bot] authored Mar 4, 2025
2 parents b47342a + 3b4f4d0 commit 81de278
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion .golangci-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ run:
- selinux
- systemd
- exclude_graphdriver_btrfs
- exclude_graphdriver_devicemapper
- containers_image_openpgp
concurrency: 6
deadline: 5m
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ run:
- selinux
- systemd
- exclude_graphdriver_btrfs
- exclude_graphdriver_devicemapper
- containers_image_openpgp
- cni
timeout: 5m
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export GOPROXY=https://proxy.golang.org

GO ?= go
GO_BUILD=$(GO) build
BUILDTAGS := containers_image_openpgp,systemd,exclude_graphdriver_devicemapper
BUILDTAGS := containers_image_openpgp,systemd
DESTDIR ?=
PREFIX := /usr/local
CONFIGDIR := ${PREFIX}/share/containers
Expand Down

0 comments on commit 81de278

Please sign in to comment.