From 48d1d3d2d51f529c589609a3880a946cba174cb8 Mon Sep 17 00:00:00 2001 From: Jo Date: Sat, 16 Mar 2024 00:55:05 +0100 Subject: [PATCH] chore(yay): update dependencies and builder (#2396) * fix libalpm14 build * update deps * try alternative arch --- Makefile | 2 +- ci.Dockerfile | 4 ++-- go.mod | 6 +++--- go.sum | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 8d5d71a45..3d7934532 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ MOFILES := $(POFILES:.po=.mo) FLAGS ?= -trimpath -mod=readonly -modcacherw EXTRA_FLAGS ?= -buildmode=pie LDFLAGS := -X "main.yayVersion=${VERSION}" -X "main.localePath=${SYSTEMLOCALEPATH}" -linkmode=external -FLAGS += $(shell pacman -T 'pacman-git' >/dev/null 2>&1 && echo "-tags next") +FLAGS += $(shell pacman -T 'libalpm.so=14-64' >/dev/null 2>&1 && echo "-tags next") RELEASE_DIR := ${PKGNAME}_${VERSION}_${ARCH} PACKAGE := $(RELEASE_DIR).tar.gz diff --git a/ci.Dockerfile b/ci.Dockerfile index 8fca3c760..167a6c0fe 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/jguer/archlinuxarm:base-devel +FROM docker.io/ljmf00/archlinux:devel LABEL maintainer="Jguer,docker@jguer.space" ENV GO111MODULE=on @@ -9,5 +9,5 @@ COPY go.mod . RUN pacman-key --init && pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && \ pacman -Su --overwrite=* --needed --noconfirm doxygen meson asciidoc go git gcc make sudo base-devel && \ rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2 && \ + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.56.2 && \ go mod download diff --git a/go.mod b/go.mod index aa63f90cd..2aeba5ec8 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/leonelquinteros/gotext v1.5.2 github.com/stretchr/testify v1.9.0 - golang.org/x/sys v0.17.0 - golang.org/x/term v0.17.0 + golang.org/x/sys v0.18.0 + golang.org/x/term v0.18.0 gopkg.in/h2non/gock.v1 v1.1.2 ) @@ -31,4 +31,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -go 1.21 \ No newline at end of file +go 1.21 diff --git a/go.sum b/go.sum index 4b0f2e705..776ccb3e7 100644 --- a/go.sum +++ b/go.sum @@ -69,12 +69,12 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=