File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -115,15 +115,14 @@ dependencies:
115
115
match : ' GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
116
116
117
117
# Golang
118
+ # TODO: this should really be eliminated and controlled by .go-version
118
119
- name : " golang: upstream version"
119
120
version : 1.24.2
120
121
refPaths :
121
122
- path : .go-version
122
123
- path : build/build-image/cross/VERSION
123
124
- path : staging/publishing/rules.yaml
124
125
match : ' default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
125
- - path : test/images/Makefile
126
- match : GOLANG_VERSION=\d+.\d+(alpha|beta|rc)?\.?\d+
127
126
128
127
# Golang pre-releases are denoted as `1.y<pre-release stage>`
129
128
# Example: go1.16rc1
Original file line number Diff line number Diff line change 12
12
# See the License for the specific language governing permissions and
13
13
# limitations under the License.
14
14
15
+ REPO_ROOT: =${CURDIR}/../..
15
16
REGISTRY ?= registry.k8s.io/e2e-test-images
16
17
GOARM ?= 7
17
18
DOCKER_CERT_BASE_PATH ?=
18
19
QEMUVERSION =v5.1.0-2
19
- GOLANG_VERSION =1.24.2
20
+ GOLANG_VERSION =$( shell cat $( REPO_ROOT ) /.go-version)
20
21
export
21
22
22
23
ifndef WHAT
You can’t perform that action at this time.
0 commit comments