Skip to content

Commit

Permalink
Merge branch 'master' into unusedparams
Browse files Browse the repository at this point in the history
  • Loading branch information
mfrancisc authored Nov 15, 2023
2 parents 05432aa + 3d66cb3 commit a884ffb
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/operator-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '*.*'
env:
GOPATH: /tmp/go
GO_VERSION: 1.19.x
GO_VERSION: 1.20.x

jobs:
binary:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-operators-for-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
GOPATH: /tmp/go
GO_VERSION: 1.19.x
GO_VERSION: 1.20.x

jobs:
binary:
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is the Developer Sandbox Registration Service repository. It implements the

== Build

Requires Go version 1.19.x (1.19.7 or higher) - download for your development environment https://golang.org/dl/[here].
Requires Go version 1.20.x (1.20.11 or higher) - download for your development environment https://golang.org/dl/[here].

This repository uses https://github.com/golang/go/wiki/Modules[Go modules].

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/codeready-toolchain/registration-service

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.100
Expand Down
6 changes: 2 additions & 4 deletions make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,10 @@ ifeq ($(E2E_REPO_PATH),"")
if [[ -n "${REMOTE_E2E_BRANCH}" ]]; then \
git config --global user.email "[email protected]"; \
git config --global user.name "Devtools"; \
# retrieve the branch name \
BRANCH_NAME=`echo ${BRANCH_REF} | awk -F'/' '{print $$3}'`; \
# add the user's fork as remote repo \
git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} remote add external ${AUTHOR_LINK}/toolchain-e2e.git; \
# fetch the branch \
git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${BRANCH_REF}; \
# fetch the branch \
git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} fetch external ${REMOTE_E2E_BRANCH}; \
# merge the branch with master \
git --git-dir=${E2E_REPO_PATH}/.git --work-tree=${E2E_REPO_PATH} merge --allow-unrelated-histories --no-commit FETCH_HEAD; \
fi;
Expand Down
4 changes: 2 additions & 2 deletions openshift-ci/Dockerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ ENV LANG=en_US.utf8 \
PATH=$PATH:$GOPATH/bin \
GIT_COMMITTER_NAME=devtools \
[email protected] \
GOLANG_VERSION=go1.19.7 \
GOLANG_SHA256=7a75720c9b066ae1750f6bcc7052aba70fa3813f4223199ee2a2315fd3eb533d
GOLANG_VERSION=go1.20.11 \
GOLANG_SHA256=ef79a11aa095a08772d2a69e4f152f897c4e96ee297b0dc20264b7dec2961abe

ARG GO_PACKAGE_PATH=github.com/codeready-toolchain/registration-service

Expand Down

0 comments on commit a884ffb

Please sign in to comment.