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

Jump to bottom

chore(deps): update registry.suse.com/bci/golang docker tag to v1.23 (master) #108

Merged
merged 3 commits into from
Sep 7, 2024
Merged

chore(deps): update registry.suse.com/bci/golang docker tag to v1.23 (master) #108

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
9262179
chore(deps): update registry.suse.com/bci/golang docker tag to v1.23
renovate[bot] Aug 24, 2024
1edfad7
chore(dockerfile): update golangci-lint to v1.60.3
derekbit Sep 7, 2024
ad4ecf3
fix: non-constant format string in call to ...
derekbit Sep 7, 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
5 changes: 3 additions & 2 deletions Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM registry.suse.com/bci/golang:1.22
FROM registry.suse.com/bci/golang:1.23

ARG DAPPER_HOST_ARCH=amd64
ARG http_proxy
ARG https_proxy
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
ENV GOLANGCI_LINT_VERSION="v1.60.3"

RUN zypper -n addrepo --refresh https://download.opensuse.org/repositories/Base:System/openSUSE_Factory/Base:System.repo && \
zypper --gpg-auto-import-keys ref
Expand All @@ -14,7 +15,7 @@ RUN zypper -n install glibc glibc-static gcc ca-certificates git wget curl vim l
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION}

ENV DAPPER_SOURCE /go/src/github.com/longhorn/sparse-tools
ENV DAPPER_OUTPUT ./bin coverage.out
Expand Down
2 changes: 1 addition & 1 deletion sparse/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ func GetFiemapRegionExts(file FileIoProcessor, interval Interval, extCount int)
_, exts, errno := file.GetFieMap().FiemapRegion(uint32(extCount), uint64(interval.Begin), uint64(interval.End-interval.Begin))
if errno != 0 {
log.Error("Failed to call fiemap.Fiemap(extCount)")
return exts, fmt.Errorf(errno.Error())
return exts, fmt.Errorf("%v", errno)
}

log.Tracef("Retrieved %v/%v extents from file %v, interval %+v, elapsed %.2fs",
Expand Down
2 changes: 1 addition & 1 deletion sparse/sfold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func coalesce(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops Fil

defer func() {
if err != nil {
log.Errorf(err.Error())
log.Errorf("%v", err)
updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops)
} else {
updateProgress(progress, progressComplete, true, nil, progressMutex, ops)
Expand Down
2 changes: 1 addition & 1 deletion sparse/sprune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func prune(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops FileHa

defer func() {
if err != nil {
log.Errorf(err.Error())
log.Errorf("%v", err)
updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops)
} else {
updateProgress(progress, progressComplete, true, nil, progressMutex, ops)
Expand Down
Loading