diff --git a/.github/workflows/ci-v2.yaml b/.github/workflows/ci-v2.yaml index 095e89a6..5c568525 100644 --- a/.github/workflows/ci-v2.yaml +++ b/.github/workflows/ci-v2.yaml @@ -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 @@ -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 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64d09c3f..f5441e4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/aetest/instance_vm.go b/aetest/instance_vm.go index 1f36bbe6..c2685e80 100644 --- a/aetest/instance_vm.go +++ b/aetest/instance_vm.go @@ -275,7 +275,7 @@ func (i *instance) appYAML() string { const appYAMLTemplate = ` application: %s version: 1 -runtime: go111 +runtime: go122 handlers: - url: /.* diff --git a/v2/aetest/instance.go b/v2/aetest/instance.go index 5ca59f64..54f912ad 100644 --- a/v2/aetest/instance.go +++ b/v2/aetest/instance.go @@ -325,7 +325,7 @@ func (i *instance) appYAML() string { const appYAMLTemplate = ` application: %s version: 1 -runtime: go111 +runtime: go122 handlers: - url: /.*