Skip to content

Commit b8323b9

Browse files
committed
requested changes
improve improvements improve improve clean improve clean improve improve improve improve
1 parent f7f9ea5 commit b8323b9

19 files changed

Lines changed: 341 additions & 294 deletions

File tree

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
defaults:
1616
run:
17-
working-directory: ./scripts/ci/pairing
17+
working-directory: ./pairing
1818
strategy:
1919
matrix:
2020
os: [ ubuntu-latest ]
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install Go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version-file: ./scripts/ci/pairing/go.mod
30+
go-version-file: ./pairing/go.mod
3131

3232
- name: Cache dependencies
3333
uses: actions/cache@v4
@@ -43,7 +43,7 @@ jobs:
4343
version: v1.63.1
4444
skip-pkg-cache: true
4545
skip-build-cache: true
46-
working-directory: ./scripts/ci/pairing
46+
working-directory: ./pairing
4747
args: --config=.golangci.yml --verbose
4848

4949
- name: Test
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ It reduces complexity and eliminates redundancy, providing a more efficient and
66

77
== Build
88

9-
Requires Go version 1.22.x (1.22.12 or higher) - download for your development environment https://golang.org/dl/[here].
9+
Requires Go version 1.21.x (1.21.13 or higher) - download for your development environment https://golang.org/dl/[here].
1010

1111
To build the binary, clone the latest version of toolchain-cicd repository:
1212

1313
```
1414
git clone https://github.com/codeready-toolchain/toolchain-cicd.git
15-
cd scripts/ci/pairing
15+
cd pairing
1616
```
1717

1818
and build the binary
Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,39 @@
11
module github.com/codeready-toolchain/pairing
22

3-
go 1.22.0
4-
5-
toolchain go1.22.12
3+
go 1.21
64

75
require (
8-
github.com/go-git/go-git/v5 v5.13.2
9-
github.com/google/go-github/v44 v44.1.0
10-
github.com/spf13/cobra v1.9.1
6+
github.com/go-git/go-git/v5 v5.12.0
7+
github.com/spf13/cobra v1.8.0
118
github.com/stretchr/testify v1.10.0
129
)
1310

1411
require (
1512
dario.cat/mergo v1.0.0 // indirect
1613
github.com/Microsoft/go-winio v0.6.1 // indirect
17-
github.com/ProtonMail/go-crypto v1.1.5 // indirect
14+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
1815
github.com/cloudflare/circl v1.3.7 // indirect
19-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
16+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
2017
github.com/davecgh/go-spew v1.1.1 // indirect
2118
github.com/emirpasic/gods v1.18.1 // indirect
2219
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
23-
github.com/go-git/go-billy/v5 v5.6.2 // indirect
20+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
2421
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
25-
github.com/google/go-querystring v1.1.0 // indirect
2622
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2723
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
2824
github.com/kevinburke/ssh_config v1.2.0 // indirect
29-
github.com/pjbgf/sha1cd v0.3.2 // indirect
25+
github.com/pjbgf/sha1cd v0.3.0 // indirect
3026
github.com/pmezard/go-difflib v1.0.0 // indirect
3127
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
32-
github.com/skeema/knownhosts v1.3.0 // indirect
33-
github.com/spf13/pflag v1.0.6 // indirect
28+
github.com/skeema/knownhosts v1.2.2 // indirect
29+
github.com/spf13/pflag v1.0.5 // indirect
3430
github.com/stretchr/objx v0.5.2 // indirect
3531
github.com/xanzy/ssh-agent v0.3.3 // indirect
36-
golang.org/x/crypto v0.32.0 // indirect
37-
golang.org/x/mod v0.17.0 // indirect
38-
golang.org/x/net v0.34.0 // indirect
39-
golang.org/x/sync v0.10.0 // indirect
40-
golang.org/x/sys v0.29.0 // indirect
41-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
32+
golang.org/x/crypto v0.21.0 // indirect
33+
golang.org/x/mod v0.12.0 // indirect
34+
golang.org/x/net v0.22.0 // indirect
35+
golang.org/x/sys v0.18.0 // indirect
36+
golang.org/x/tools v0.13.0 // indirect
4237
gopkg.in/warnings.v0 v0.1.2 // indirect
4338
gopkg.in/yaml.v3 v3.0.1 // indirect
4439
)
Lines changed: 80 additions & 49 deletions
Large diffs are not rendered by default.

pairing/make/build.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
goarch?=$(shell go env GOARCH)
2+
3+
.PHONY: build
4+
build:
5+
@go version
6+
mkdir -p $(OUT_DIR)/bin || true
7+
$(Q)CGO_ENABLED=0 GOARCH=${goarch} GOOS=linux \
8+
go build ${V_FLAG} ./...

0 commit comments

Comments
 (0)