Skip to content

Commit 14260eb

Browse files
Merge pull request #19 from bitrise-io/renovate/all-minor-patch
chore(deps): update all non-major dependencies
2 parents fb104bb + a92dcd6 commit 14260eb

File tree

10 files changed

+53
-38
lines changed

10 files changed

+53
-38
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ bin/
33
.bitrise.secrets.yml
44
dist/
55
_tmp/
6-
.idea/
6+
.idea/*
7+
!.idea/codeStyles
8+
.idea/codeStyles/*
9+
!.idea/codeStyles/Project.xml

.golangci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ linters:
2020
- depguard
2121
- exhaustruct
2222
- paralleltest
23-
- testpackage
23+
- testpackage
24+
- mnd
25+
- gomnd

.idea/codeStyles/Project.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Tool versions
2+
GOLANGCI_LINT_VERSION = v1.58.1
3+
4+
.PHONY: lint
5+
lint: ## Runs golangci-lint
6+
go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --timeout 5m
7+
8+
.PHONY: govulncheck
9+
govulncheck: ## Runs govulncheck
10+
go run golang.org/x/vuln/cmd/govulncheck@latest -test ./...
11+
12+
.PHONY: test-unit
13+
test-unit: ## Runs all tests
14+
go test -tags unit ./...

bitrise.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project_type: other
44
meta:
55
bitrise.io:
66
machine_type_id: standard
7-
stack: linux-docker-android-20.04
7+
stack: linux-docker-android-22.04
88
trigger_map:
99
- push_branch: main
1010
workflow: test
@@ -24,19 +24,12 @@ workflows:
2424
inputs:
2525
- fetch_tags: "yes"
2626
- script@1:
27-
title: asdf install
27+
title: asdf use latest go
2828
inputs:
2929
- content: |-
3030
#!/usr/bin/env bash
31-
# fail if any commands fails
32-
set -e
33-
# make pipelines' return status equal the last command to exit with a non-zero status, or zero if all commands exit successfully
34-
set -o pipefail
35-
# debug log
36-
set -x
3731
38-
# write your script here
39-
asdf install
32+
asdf global golang 1.22
4033
- script:
4134
title: Goreleaser (create binaries + publish to GH)
4235
deps:
@@ -65,8 +58,7 @@ workflows:
6558
- content: |-
6659
#!/bin/bash
6760
set -ex
68-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.58.0
69-
./bin/golangci-lint run -v
61+
make lint
7062
- go-test@1: {}
7163
- deploy-to-bitrise-io@2: {}
7264
e2e:

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/bitrise-io/bitrise-build-cache-cli
22

3-
go 1.21
3+
go 1.22.3
44

55
require (
6-
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.28
7-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20
6+
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.29
7+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.21
88
github.com/spf13/cobra v1.8.0
9-
github.com/stretchr/testify v1.8.4
9+
github.com/stretchr/testify v1.9.0
1010
)
1111

1212
require (
@@ -23,6 +23,6 @@ require (
2323
github.com/mitchellh/mapstructure v1.5.0 // indirect
2424
github.com/pmezard/go-difflib v1.0.0 // indirect
2525
github.com/spf13/pflag v1.0.5 // indirect
26-
github.com/stretchr/objx v0.5.0 // indirect
26+
github.com/stretchr/objx v0.5.2 // indirect
2727
gopkg.in/yaml.v3 v3.0.1 // indirect
2828
)

go.sum

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.28 h1:HW9AueDVlrEN96riYgKAxwvn4VPZo15S0ooL6KC0Zts=
2-
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.28/go.mod h1:aS6TO1DpbWJoBuAlvmpS/I/FU97C71wv1F/+p+kVrCk=
1+
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.29 h1:of5Njxd2pJOCp2168uUJ9fMEjKioYu+6wCjiZx2oioo=
2+
github.com/bitrise-io/go-steputils/v2 v2.0.0-alpha.29/go.mod h1:aS6TO1DpbWJoBuAlvmpS/I/FU97C71wv1F/+p+kVrCk=
33
github.com/bitrise-io/go-utils v1.0.1 h1:e7mepVBkVN1DXRPESNXb0djEw6bxB6B93p/Q74zzcvk=
44
github.com/bitrise-io/go-utils v1.0.1/go.mod h1:ZY1DI+fEpZuFpO9szgDeICM4QbqoWVt0RSY3tRI1heY=
5-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20 h1:R+xJRWsuHhF/Pnx0gjI1+HH4Y0YSFVI+U/CbLpSx4sU=
6-
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.20/go.mod h1:Laih4ji980SQkRgdnMCH0g4u2GZI/5nnbqmYT9UfKFQ=
5+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.21 h1:iwNnwOGg8VP8eqhse68Fxt5ZnfEYosgV2gRZB7LKfHg=
6+
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.21/go.mod h1:Laih4ji980SQkRgdnMCH0g4u2GZI/5nnbqmYT9UfKFQ=
77
github.com/bmatcuk/doublestar/v4 v4.2.0 h1:Qu+u9wR3Vd89LnlLMHvnZ5coJMWKQamqdz9/p5GNthA=
88
github.com/bmatcuk/doublestar/v4 v4.2.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
99
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
@@ -39,16 +39,13 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
3939
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
4040
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4141
github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
42-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
43-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
44-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
42+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
43+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
4544
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
4645
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
4746
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
48-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
49-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
50-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
51-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
47+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
48+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
5249
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
5350
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
5451
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

internal/config/gradle/gradleconfig_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ initscript {
110110
maven(url="https://jitpack.io")
111111
}
112112
dependencies {
113-
classpath("io.bitrise.gradle:remote-cache:1.2.4")
114-
classpath("io.bitrise.gradle:gradle-analytics:2.1.3")
113+
classpath("io.bitrise.gradle:remote-cache:1.2.5")
114+
classpath("io.bitrise.gradle:gradle-analytics:2.1.4")
115115
}
116116
}
117117
@@ -165,8 +165,8 @@ initscript {
165165
maven(url="https://jitpack.io")
166166
}
167167
dependencies {
168-
classpath("io.bitrise.gradle:remote-cache:1.2.4")
169-
classpath("io.bitrise.gradle:gradle-analytics:2.1.3")
168+
classpath("io.bitrise.gradle:remote-cache:1.2.5")
169+
classpath("io.bitrise.gradle:gradle-analytics:2.1.4")
170170
}
171171
}
172172
@@ -217,7 +217,7 @@ initscript {
217217
maven(url="https://jitpack.io")
218218
}
219219
dependencies {
220-
classpath("io.bitrise.gradle:remote-cache:1.2.4")
220+
classpath("io.bitrise.gradle:remote-cache:1.2.5")
221221
}
222222
}
223223

internal/consts/consts.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ const (
66
EndpointURLATL1 = "grpc://atl-cache.services.bitrise.io:6666"
77

88
// Gradle Remote Build Cache related consts
9-
GradleRemoteBuildCachePluginDepVersion = "1.2.4"
9+
GradleRemoteBuildCachePluginDepVersion = "1.2.5"
1010

1111
// Gradle Analytics related consts
12-
GradleAnalyticsPluginDepVersion = "2.1.3"
12+
GradleAnalyticsPluginDepVersion = "2.1.4"
1313
GradleAnalyticsEndpoint = "gradle-analytics.services.bitrise.io"
1414
GradleAnalyticsHTTPEndpoint = "https://gradle-sink.services.bitrise.io"
1515
GradleAnalyticsPort = 443

0 commit comments

Comments
 (0)