Skip to content
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.

Sign up for GitHub

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

chore(deps): update dependency containers/automation_images to v20240320 #2354

Merged
merged 3 commits into from
Mar 26, 2024
Merged

chore(deps): update dependency containers/automation_images to v20240320 #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11a0e86
chore(deps): update dependency containers/automation_images to v20240320
renovate[bot] Mar 21, 2024
d847108
Use (go install) instead of (go get)
mtrmac Mar 21, 2024
b6b60bf
Stop setting GO111MODULE=on
mtrmac Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
SKOPEO_PR:

# Google-cloud VM Images
IMAGE_SUFFIX: "c20240125t184057z-f39f38d13"
IMAGE_SUFFIX: "c20240320t153921z-f39f38d13"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"

Expand Down Expand Up @@ -72,7 +72,7 @@
script: make cross


test_task:

Check warning on line 75 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L75 

task "Test" depends on task "validate", but their only_if conditions are different

Check warning on line 75 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L75 

task "Test w/ opengpg" depends on task "validate", but their only_if conditions are different

Check warning on line 75 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L75 

task "Test" depends on task "validate", but their only_if conditions are different

Check warning on line 75 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L75 

task "Test w/ opengpg" depends on task "validate", but their only_if conditions are different
alias: test
depends_on:
- validate
Expand All @@ -93,7 +93,7 @@
##### repository's `.cirrus.yml`. Changes made here should be fully merged
##### prior to being manually duplicated and maintained in containers/skopeo.
#####
test_skopeo_task:

Check warning on line 96 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L96 

task "Skopeo Test" depends on task "validate", but their only_if conditions are different

Check warning on line 96 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L96 

task "Skopeo Test w/ opengpg" depends on task "validate", but their only_if conditions are different

Check warning on line 96 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L96 

task "Skopeo Test" depends on task "validate", but their only_if conditions are different

Check warning on line 96 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L96 

task "Skopeo Test w/ opengpg" depends on task "validate", but their only_if conditions are different
alias: test_skopeo
only_if: *not_docs
depends_on:
Expand Down Expand Up @@ -155,7 +155,7 @@
# Status aggregator for all tests. This task simply ensures a defined
# set of tasks all passed, and allows confirming that based on the status
# of this task.
success_task:

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "validate", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "cross", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Test", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Test w/ opengpg", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Skopeo Test", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Skopeo Test w/ opengpg", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "validate", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "cross", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Test", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Test w/ opengpg", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Skopeo Test", but their only_if conditions are different

Check warning on line 158 in .cirrus.yml

View check run for this annotation

Cirrus CI / Build Parsing Results

.cirrus.yml#L158 

task "Total Success" depends on task "Skopeo Test w/ opengpg", but their only_if conditions are different
name: "Total Success"
alias: success
# N/B: ALL tasks must be listed here, minus their '_task' suffix.
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
BUILDFLAGS := -tags "$(BUILDTAGS)"

PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)

PREFIX ?= ${DESTDIR}/usr
Expand All @@ -41,7 +41,7 @@ export PATH := $(PATH):${GOBIN}
all: tools test validate .gitvalidation

build:
GO111MODULE="on" go build $(BUILDFLAGS) ./...
go build $(BUILDFLAGS) ./...

$(MANPAGES): %: %.md
$(GOMD2MAN) -in $< -out $@
Expand All @@ -66,7 +66,7 @@ tools: .install.gitvalidation .install.golangci-lint

.install.gitvalidation:
if [ ! -x "$(GOBIN)/git-validation" ]; then \
GO111MODULE="off" go get $(BUILDFLAGS) github.com/vbatts/git-validation; \
go install github.com/vbatts/git-validation@latest; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this is obviously the part I missed. LGTM.

fi

.install.golangci-lint:
Expand All @@ -78,7 +78,7 @@ clean:
rm -rf $(MANPAGES)

test:
@GO111MODULE="on" go test $(BUILDFLAGS) -cover ./...
@go test $(BUILDFLAGS) -cover ./...

fmt:
@gofmt -l -s -w $(SOURCE_DIRS)
Expand Down
2 changes: 1 addition & 1 deletion hack/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ -z $(type -P gofmt) ]]; then
fi

echo "Executing go vet"
GO111MODULE="on" go vet -tags="$BUILDTAGS" ./...
go vet -tags="$BUILDTAGS" ./...

echo "Executing gofmt"
OUTPUT=$(gofmt -s -l . | sed -e '/^vendor/d')
Expand Down