Browse Source

fix(ci): fix env propagation
fix broken ci artifact download

jguer 4 years ago
parent
commit
d003e96e07
26 changed files with 58 additions and 57 deletions
  1. 6 5
      .github/workflows/docker-multiarch-tag.yml
  2. 1 1
      .golangci.yml
  3. 1 1
      .pre-commit-config.yaml
  4. 4 4
      Makefile
  5. 1 1
      callbacks.go
  6. 2 2
      clean.go
  7. 3 3
      cmd.go
  8. 2 2
      config.go
  9. 2 2
      depCheck.go
  10. 1 1
      depOrder.go
  11. 1 1
      depPool.go
  12. 2 2
      download.go
  13. 1 1
      exec.go
  14. 3 3
      go.mod
  15. 4 4
      go.sum
  16. 5 5
      install.go
  17. 1 1
      keys.go
  18. 1 1
      main.go
  19. 1 1
      parser.go
  20. 1 1
      pkg/intrange/intrange.go
  21. 1 1
      pkg/intrange/intrange_test.go
  22. 3 3
      print.go
  23. 4 4
      query.go
  24. 4 4
      upgrade.go
  25. 1 1
      utils.go
  26. 2 2
      vcs.go

+ 6 - 5
.github/workflows/docker-multiarch-tag.yml

@@ -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

+ 1 - 1
.golangci.yml

@@ -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:

+ 1 - 1
.pre-commit-config.yaml

@@ -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

+ 4 - 4
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

+ 1 - 1
callbacks.go

@@ -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) {

+ 2 - 2
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.

+ 3 - 3
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()

+ 2 - 2
config.go

@@ -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"
 

+ 2 - 2
depCheck.go

@@ -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) {

+ 1 - 1
depOrder.go

@@ -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

+ 1 - 1
depPool.go

@@ -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 {

+ 2 - 2
download.go

@@ -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"

+ 1 - 1
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 {

+ 3 - 3
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

+ 4 - 4
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=

+ 5 - 5
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 {

+ 1 - 1
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.

+ 1 - 1
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 {

+ 1 - 1
parser.go

@@ -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

+ 1 - 1
pkg/intrange/intrange.go

@@ -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

+ 1 - 1
pkg/intrange/intrange_test.go

@@ -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) {

+ 3 - 3
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 = "==>"

+ 4 - 4
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 {

+ 4 - 4
upgrade.go

@@ -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.

+ 1 - 1
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"

+ 2 - 2
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