Skip to content

Commit 3ab9c40

Browse files
kennethye1kennethye1
authored
Update go versions to 1.22 and remove end of support runtimes (#353)
* Update go versions to 1.22 Signed-off-by: kennethye1 <[email protected]> * Upgrade aetest to go122 Signed-off-by: kennethye1 <[email protected]> --------- Signed-off-by: kennethye1 <[email protected]>
1 parent aabaab1 commit 3ab9c40

File tree

4 files changed

+5
-102
lines changed

4 files changed

+5
-102
lines changed

‎.github/workflows/ci-v2.yaml

+2-52
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
go-version: ['1.11.x', '1.13.x', '1.16.x', '1.18.x', '1.19.x', '1.20.x', '1.21.x']
18+
go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']
1919
env:
2020
working-directory: ./v2
2121

@@ -58,54 +58,4 @@ jobs:
5858
export CLOUDSDK_PYTHON="python3"
5959
go test -v -cover -race google.golang.org/appengine/v2/...
6060
# TestAPICallAllocations doesn't run under race detector.
61-
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
62-
63-
test-gopath-v2:
64-
runs-on: ubuntu-latest
65-
strategy:
66-
fail-fast: false
67-
matrix:
68-
# GOPATH is deprecated in go 1.13.
69-
go-version: [ '1.11.x', '1.12.x']
70-
env:
71-
working-directory: ./v2
72-
73-
steps:
74-
- name: Update base image, intall Python2 and Python3
75-
run: |
76-
sudo apt-get update
77-
sudo apt-get install -y python2
78-
sudo apt-get install -y python3
79-
- name: Set up Go
80-
uses: actions/setup-go@v2
81-
with:
82-
go-version: ${{ matrix.go-version }}
83-
- name: Checkout
84-
uses: actions/checkout@v2
85-
- name: Cache go modules
86-
uses: actions/cache@v2
87-
with:
88-
path: |
89-
~/.cache/go-build
90-
~/go/pkg/mod
91-
key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
92-
restore-keys: |
93-
${{ runner.os }}-${{ matrix.go-version }}-go-
94-
- name: Set up Cloud SDK
95-
uses: google-github-actions/setup-gcloud@v0
96-
- name: Install
97-
working-directory: ${{env.working-directory}}
98-
env:
99-
GO111MODULE: off
100-
run: |
101-
go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
102-
go get -u google.golang.org/appengine/v2
103-
gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
104-
- name: Test gopath v2
105-
working-directory: ${{env.working-directory}}
106-
run: |
107-
export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
108-
export CLOUDSDK_PYTHON="python3"
109-
go test -v -cover -race google.golang.org/appengine/v2/...
110-
# TestAPICallAllocations doesn't run under race detector.
111-
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
61+
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations

‎.github/workflows/ci.yml

+1-48
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x', '1.18.x', '1.19.x', '1.20.x']
18+
go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']
1919

2020
steps:
2121
- name: Update base image, intall Python2 and Python3
@@ -56,50 +56,3 @@ jobs:
5656
go test -v -cover -race google.golang.org/appengine/...
5757
# TestAPICallAllocations doesn't run under race detector.
5858
go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations
59-
60-
test-gopath:
61-
runs-on: ubuntu-latest
62-
strategy:
63-
fail-fast: false
64-
matrix:
65-
# GOPATH is deprecated in go 1.13.
66-
go-version: [ '1.11.x', '1.12.x']
67-
68-
steps:
69-
- name: Update base image, intall Python2 and Python3
70-
run: |
71-
sudo apt-get update
72-
sudo apt-get install -y python2
73-
sudo apt-get install -y python3
74-
export CLOUDSDK_PYTHON="python3"
75-
- name: Set up Go
76-
uses: actions/setup-go@v2
77-
with:
78-
go-version: ${{ matrix.go-version }}
79-
- name: Checkout
80-
uses: actions/checkout@v2
81-
- name: Cache go modules
82-
uses: actions/cache@v2
83-
with:
84-
path: |
85-
~/.cache/go-build
86-
~/go/pkg/mod
87-
key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
88-
restore-keys: |
89-
${{ runner.os }}-${{ matrix.go-version }}-go-
90-
- name: Set up Cloud SDK
91-
uses: google-github-actions/setup-gcloud@v0
92-
- name: Install
93-
env:
94-
GO111MODULE: off
95-
run: |
96-
go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
97-
go get -u google.golang.org/appengine
98-
gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
99-
- name: Test gopath
100-
run: |
101-
export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
102-
export CLOUDSDK_PYTHON="python3"
103-
go test -v -cover -race google.golang.org/appengine/...
104-
# TestAPICallAllocations doesn't run under race detector.
105-
go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations

‎aetest/instance_vm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func (i *instance) appYAML() string {
275275
const appYAMLTemplate = `
276276
application: %s
277277
version: 1
278-
runtime: go111
278+
runtime: go122
279279
280280
handlers:
281281
- url: /.*

‎v2/aetest/instance.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func (i *instance) appYAML() string {
325325
const appYAMLTemplate = `
326326
application: %s
327327
version: 1
328-
runtime: go111
328+
runtime: go122
329329
330330
handlers:
331331
- url: /.*

0 commit comments

Comments
 (0)