Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update go versions to 1.22 #353

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Update go versions to 1.22 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e561457
Update go versions to 1.22
kennethye1 Apr 8, 2024
4237290
Upgrade aetest to go122
kennethye1 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 2 additions & 52 deletions .github/workflows/ci-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ['1.11.x', '1.13.x', '1.16.x', '1.18.x', '1.19.x', '1.20.x', '1.21.x']
go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']
env:
working-directory: ./v2

Expand Down Expand Up @@ -58,54 +58,4 @@ jobs:
export CLOUDSDK_PYTHON="python3"
go test -v -cover -race google.golang.org/appengine/v2/...
# TestAPICallAllocations doesn't run under race detector.
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations

test-gopath-v2:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# GOPATH is deprecated in go 1.13.
go-version: [ '1.11.x', '1.12.x']
env:
working-directory: ./v2

steps:
- name: Update base image, intall Python2 and Python3
run: |
sudo apt-get update
sudo apt-get install -y python2
sudo apt-get install -y python3
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
- name: Checkout
uses: actions/checkout@v2
- name: Cache go modules
uses: actions/cache@v2
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v0
- name: Install
working-directory: ${{env.working-directory}}
env:
GO111MODULE: off
run: |
go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
go get -u google.golang.org/appengine/v2
gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
- name: Test gopath v2
working-directory: ${{env.working-directory}}
run: |
export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
export CLOUDSDK_PYTHON="python3"
go test -v -cover -race google.golang.org/appengine/v2/...
# TestAPICallAllocations doesn't run under race detector.
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
go test -v -cover google.golang.org/appengine/v2/internal/... -run TestAPICallAllocations
49 changes: 1 addition & 48 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
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']
go-version: ['1.19.x', '1.20.x', '1.21.x', '1.22.x']

steps:
- name: Update base image, intall Python2 and Python3
Expand Down Expand Up @@ -56,50 +56,3 @@ jobs:
go test -v -cover -race google.golang.org/appengine/...
# TestAPICallAllocations doesn't run under race detector.
go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations

test-gopath:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# GOPATH is deprecated in go 1.13.
go-version: [ '1.11.x', '1.12.x']

steps:
- name: Update base image, intall Python2 and Python3
run: |
sudo apt-get update
sudo apt-get install -y python2
sudo apt-get install -y python3
export CLOUDSDK_PYTHON="python3"
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ${{ matrix.go-version }}
- name: Checkout
uses: actions/checkout@v2
- name: Cache go modules
uses: actions/cache@v2
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v0
- name: Install
env:
GO111MODULE: off
run: |
go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
go get -u google.golang.org/appengine
gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
- name: Test gopath
run: |
export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
export CLOUDSDK_PYTHON="python3"
go test -v -cover -race google.golang.org/appengine/...
# TestAPICallAllocations doesn't run under race detector.
go test -v -cover google.golang.org/appengine/internal/... -run TestAPICallAllocations
2 changes: 1 addition & 1 deletion aetest/instance_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func (i *instance) appYAML() string {
const appYAMLTemplate = `
application: %s
version: 1
runtime: go111
runtime: go122

handlers:
- url: /.*
Expand Down
2 changes: 1 addition & 1 deletion v2/aetest/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func (i *instance) appYAML() string {
const appYAMLTemplate = `
application: %s
version: 1
runtime: go111
runtime: go122

handlers:
- url: /.*
Expand Down