mirror of https://github.com/containers/image.git
Stop setting the btrfs_noversion build tag
It was removed in https://github.com/containers/storage/pull/2308 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
parent
a470ffe0be
commit
182e62e948
|
|
@ -81,10 +81,10 @@ test_task:
|
||||||
matrix:
|
matrix:
|
||||||
- name: "Test"
|
- name: "Test"
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: 'btrfs_noversion'
|
BUILDTAGS: ''
|
||||||
- name: "Test w/ opengpg"
|
- name: "Test w/ opengpg"
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: &withopengpg 'btrfs_noversion containers_image_openpgp'
|
BUILDTAGS: &withopengpg 'containers_image_openpgp'
|
||||||
script: ${GOSRC}/${SCRIPT_BASE}/runner.sh image_tests
|
script: ${GOSRC}/${SCRIPT_BASE}/runner.sh image_tests
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -110,7 +110,7 @@ test_skopeo_task:
|
||||||
matrix:
|
matrix:
|
||||||
- name: "Skopeo Test"
|
- name: "Skopeo Test"
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: 'btrfs_noversion'
|
BUILDTAGS: ''
|
||||||
- name: "Skopeo Test w/ opengpg"
|
- name: "Skopeo Test w/ opengpg"
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: *withopengpg
|
BUILDTAGS: *withopengpg
|
||||||
|
|
|
||||||
2
Makefile
2
Makefile
|
|
@ -10,7 +10,7 @@ endif
|
||||||
BUILD_TAGS_WINDOWS_CROSS = containers_image_openpgp
|
BUILD_TAGS_WINDOWS_CROSS = containers_image_openpgp
|
||||||
BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
|
BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
|
||||||
|
|
||||||
BUILDTAGS = btrfs_noversion
|
BUILDTAGS =
|
||||||
BUILDFLAGS := -tags "$(BUILDTAGS)"
|
BUILDFLAGS := -tags "$(BUILDTAGS)"
|
||||||
|
|
||||||
PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
|
PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue