mirror of
https://github.com/Jguer/yay
synced 2024-10-01 13:53:32 +00:00
fix(ci): fix env propagation
fix broken ci artifact download
This commit is contained in:
parent
5734faf33b
commit
d003e96e07
11
.github/workflows/docker-multiarch-tag.yml
vendored
11
.github/workflows/docker-multiarch-tag.yml
vendored
|
@ -10,11 +10,12 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: mathieudutour/github-tag-action@v4
|
||||
- uses: mathieudutour/github-tag-action@v4.5
|
||||
id: tag_version
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag_prefix: "v"
|
||||
create_annotated_tag: true
|
||||
- name: share variables
|
||||
shell: bash
|
||||
run: |
|
||||
|
@ -43,7 +44,7 @@ jobs:
|
|||
id: tags
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=VERSION::$(cat env/new_version)
|
||||
echo ::set-output name=VERSION::$(cat new_version)
|
||||
- name: Install dependencies
|
||||
run: sudo apt update -y && sudo apt install -y qemu qemu-user-static
|
||||
- name: Setup qemu-user-static
|
||||
|
@ -71,9 +72,9 @@ jobs:
|
|||
id: tags
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=VERSION::$(cat env/new_version)
|
||||
echo ::set-output name=TAG::$(cat env/new_tag)
|
||||
echo ::set-output name=CHANGELOG::$(cat env/changelog)
|
||||
echo ::set-output name=VERSION::$(cat new_version)
|
||||
echo ::set-output name=TAG::$(cat new_tag)
|
||||
echo ::set-output name=CHANGELOG::$(cat changelog)
|
||||
- uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: yay_x86_64
|
||||
|
|
|
@ -23,7 +23,7 @@ linters-settings:
|
|||
gocyclo:
|
||||
min-complexity: 15
|
||||
goimports:
|
||||
local-prefixes: github.com/Jguer/yay/v9
|
||||
local-prefixes: github.com/Jguer/yay/v10
|
||||
golint:
|
||||
min-confidence: 0
|
||||
gomnd:
|
||||
|
|
|
@ -4,7 +4,7 @@ repos:
|
|||
hooks:
|
||||
- id: go-fmt
|
||||
- id: go-imports
|
||||
args: [-local=github.com/Jguer/yay/v9/]
|
||||
args: [-local=github.com/Jguer/yay/v10/]
|
||||
- id: golangci-lint
|
||||
- id: go-unit-tests
|
||||
- id: go-build
|
||||
|
|
8
Makefile
8
Makefile
|
@ -1,5 +1,5 @@
|
|||
export GO111MODULE=on
|
||||
GOPROXY ?= https://proxy.golang.org
|
||||
GOPROXY ?= https://gocenter.io,direct
|
||||
export GOPROXY
|
||||
|
||||
BUILD_TAG = devel
|
||||
|
@ -10,9 +10,9 @@ GO ?= go
|
|||
PKGNAME := yay
|
||||
PREFIX := /usr/local
|
||||
|
||||
MAJORVERSION := 9
|
||||
MINORVERSION := 4
|
||||
PATCHVERSION := 7
|
||||
MAJORVERSION := 10
|
||||
MINORVERSION := 0
|
||||
PATCHVERSION := 0
|
||||
VERSION ?= ${MAJORVERSION}.${MINORVERSION}.${PATCHVERSION}
|
||||
|
||||
LOCALEDIR := po
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
func questionCallback(question alpm.QuestionAny) {
|
||||
|
|
4
clean.go
4
clean.go
|
@ -8,8 +8,8 @@ import (
|
|||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
// GetPkgbuild gets the pkgbuild of the package 'pkg' trying the ABS first and then the AUR trying the ABS first and then the AUR.
|
||||
|
|
6
cmd.go
6
cmd.go
|
@ -9,9 +9,9 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/completion"
|
||||
"github.com/Jguer/yay/v9/pkg/intrange"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/completion"
|
||||
"github.com/Jguer/yay/v10/pkg/intrange"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
var cmdArgs = makeArguments()
|
||||
|
|
|
@ -13,7 +13,7 @@ import (
|
|||
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
// Verbosity settings for search
|
||||
|
@ -84,7 +84,7 @@ type Configuration struct {
|
|||
BatchInstall bool `json:"batchinstall"`
|
||||
}
|
||||
|
||||
var yayVersion = "9.4.3"
|
||||
var yayVersion = "10.0.0"
|
||||
|
||||
var localePath = "/usr/share/locale"
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
func (dp *depPool) checkInnerConflict(name, conflict string, conflicts stringset.MapStringSet) {
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
// Base is an AUR base package
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
type target struct {
|
||||
|
|
|
@ -12,8 +12,8 @@ import (
|
|||
"github.com/leonelquinteros/gotext"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/multierror"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/multierror"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
const gitDiffRefName = "AUR_SEEN"
|
||||
|
|
2
exec.go
2
exec.go
|
@ -12,7 +12,7 @@ import (
|
|||
"github.com/leonelquinteros/gotext"
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
func show(cmd *exec.Cmd) error {
|
||||
|
|
6
go.mod
6
go.mod
|
@ -1,4 +1,4 @@
|
|||
module github.com/Jguer/yay/v9
|
||||
module github.com/Jguer/yay/v10
|
||||
|
||||
require (
|
||||
github.com/Jguer/go-alpm v0.0.0-20200405152916-a3feea4322e9
|
||||
|
@ -7,8 +7,8 @@ require (
|
|||
github.com/leonelquinteros/gotext v1.4.0
|
||||
github.com/mikkeloscar/aur v0.0.0-20200113170522-1cb4e2949656
|
||||
github.com/pkg/errors v0.9.1
|
||||
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
|
||||
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
|
||||
golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
|
||||
)
|
||||
|
||||
go 1.14
|
||||
|
|
8
go.sum
8
go.sum
|
@ -11,12 +11,12 @@ github.com/mikkeloscar/aur v0.0.0-20200113170522-1cb4e2949656/go.mod h1:nYOKcK8t
|
|||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
|
||||
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
|
||||
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
|
||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200610111108-226ff32320da h1:bGb80FudwxpeucJUjPYJXuJ8Hk91vNtfvrymzwiei38=
|
||||
golang.org/x/sys v0.0.0-20200610111108-226ff32320da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
|
|
10
install.go
10
install.go
|
@ -14,11 +14,11 @@ import (
|
|||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/completion"
|
||||
"github.com/Jguer/yay/v9/pkg/intrange"
|
||||
"github.com/Jguer/yay/v9/pkg/multierror"
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/completion"
|
||||
"github.com/Jguer/yay/v10/pkg/intrange"
|
||||
"github.com/Jguer/yay/v10/pkg/multierror"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
func asdeps(parser *arguments, pkgs []string) error {
|
||||
|
|
2
keys.go
2
keys.go
|
@ -11,7 +11,7 @@ import (
|
|||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
// pgpKeySet maps a PGP key with a list of PKGBUILDs that require it.
|
||||
|
|
2
main.go
2
main.go
|
@ -12,7 +12,7 @@ import (
|
|||
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
func setPaths() error {
|
||||
|
|
|
@ -12,7 +12,7 @@ import (
|
|||
rpc "github.com/mikkeloscar/aur"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
// Parses command line arguments in a way we can interact with programmatically but
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"strings"
|
||||
"unicode"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
// IntRange stores a max and min amount for range
|
||||
|
|
|
@ -3,7 +3,7 @@ package intrange
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
func TestParseNumberMenu(t *testing.T) {
|
||||
|
|
6
print.go
6
print.go
|
@ -15,9 +15,9 @@ import (
|
|||
"github.com/leonelquinteros/gotext"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/intrange"
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/intrange"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
const arrow = "==>"
|
||||
|
|
8
query.go
8
query.go
|
@ -13,10 +13,10 @@ import (
|
|||
"github.com/leonelquinteros/gotext"
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/intrange"
|
||||
"github.com/Jguer/yay/v9/pkg/multierror"
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/intrange"
|
||||
"github.com/Jguer/yay/v10/pkg/multierror"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
type aurWarnings struct {
|
||||
|
|
|
@ -9,13 +9,13 @@ import (
|
|||
alpm "github.com/Jguer/go-alpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/intrange"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/intrange"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
|
||||
rpc "github.com/mikkeloscar/aur"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/multierror"
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/multierror"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
)
|
||||
|
||||
// upgrade type describes a system upgrade.
|
||||
|
|
2
utils.go
2
utils.go
|
@ -5,7 +5,7 @@ import (
|
|||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
const gitEmptyTree = "4b825dc642cb6eb9a060e54bf8d69288fbee4904"
|
||||
|
|
4
vcs.go
4
vcs.go
|
@ -12,8 +12,8 @@ import (
|
|||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v9/pkg/stringset"
|
||||
"github.com/Jguer/yay/v9/pkg/text"
|
||||
"github.com/Jguer/yay/v10/pkg/stringset"
|
||||
"github.com/Jguer/yay/v10/pkg/text"
|
||||
)
|
||||
|
||||
// Info contains the last commit sha of a repo
|
||||
|
|
Loading…
Reference in a new issue