Skip to content

Commit

Permalink
Merge branch 'master' into chore/tpg-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
apeabody authored Oct 30, 2023
2 parents a163423 + 6d537a3 commit c39be14
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Make will use bash instead of sh
SHELL := /usr/bin/env bash

DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.13
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
REGISTRY_URL := gcr.io/cloud-foundation-cicd

Expand Down
2 changes: 1 addition & 1 deletion build/int.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ tags:
- 'integration'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
2 changes: 1 addition & 1 deletion build/lint.cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ tags:
- 'lint'
substitutions:
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
1 change: 1 addition & 0 deletions test/integration/basic/testdata/TestBasic.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"autoNetworkTier": "PREMIUM",
"enableEndpointIndependentMapping": true,
"enableDynamicPortAllocation": false,
"endpointTypes": [
Expand Down

0 comments on commit c39be14

Please sign in to comment.