Skip to content

refactor: pin setup-gcloud gh action to v0 #271

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

Merged
merged 5 commits into from
Jan 5, 2022
Merged

refactor: pin setup-gcloud gh action to v0 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f804775
Update qa github action to be equivalent to master branch.
KaylaNguyen Jul 22, 2021
89df3fd
merge with qa branch
KaylaNguyen Aug 30, 2021
2b248ce
Merge branch 'qa' of https://github.com/golang/appengine into qa
KaylaNguyen Dec 29, 2021
7cc6486
pin setup-gcloud gh action to v0
KaylaNguyen Dec 29, 2021
3125734
Change log to stderr and trace to X-Cloud-Trace-Context
KaylaNguyen Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x']
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x']
env:
working-directory: ./v2

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@master
uses: google-github-actions/setup-gcloud@v0
- name: Install
working-directory: ${{env.working-directory}}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x']
go-version: [ '1.11.x', '1.12.x', '1.13.x', '1.14.x', '1.15.x', '1.16.x']

steps:
- name: Set up Go
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ matrix.go-version }}-go-
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@master
uses: google-github-actions/setup-gcloud@v0
Copy link
Collaborator

@jinglundong jinglundong Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you help me understand why "uses" v0 only is sufficient? I'm trying to make sure we don't lose CI coverage. In other words, why not using two workflows one for v0 (like staging?) and another one for master?

Copy link
Collaborator Author

@KaylaNguyen KaylaNguyen Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

setup-gcloud github action repo is renaming their master branch so they're suggesting to pin to v0 instead: https://github.com/google-github-actions/setup-gcloud#-notices

Copy link
Collaborator

@jinglundong jinglundong Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. It's an official rename. LGTM.

- name: Install
env:
GO111MODULE: off
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ A few APIs were cleaned up, and there are some differences:
* `appengine/socket` is not required on App Engine flexible environment / Managed VMs.
Use the standard `net` package instead.

## Key Encode/Decode compatibiltiy to help with datastore library migrations
## Key Encode/Decode compatibility to help with datastore library migrations

Key compatibility updates have been added to help customers transition from google.golang.org/appengine/datastore to cloud.google.com/go/datastore.
The `EnableKeyConversion` enables automatic conversion from a key encoded with cloud.google.com/go/datastore to google.golang.org/appengine/datastore key type.
Expand Down
2 changes: 1 addition & 1 deletion v2/internal/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var (
backgroundContextOnce sync.Once
backgroundContext netcontext.Context

logStream io.Writer = os.Stdout // For test hooks.
logStream io.Writer = os.Stderr // For test hooks.
timeNow func() time.Time = time.Now // For test hooks.
)

Expand Down
2 changes: 1 addition & 1 deletion v2/internal/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func chunkLog(msg string) []string {
}

func traceAndSpan(c *context) (string, string) {
headers := c.req.Header["Cloud-Trace-Context"]
headers := c.req.Header["X-Cloud-Trace-Context"]
if len(headers) < 1 {
return "", ""
}
Expand Down
2 changes: 1 addition & 1 deletion v2/internal/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ func buildContextWithTraceHeaders(t *testing.T, headers []string) *context {
t.Fatal(err)
}
for _, h := range headers {
req.Header.Add("Cloud-Trace-Context", h)
req.Header.Add("X-Cloud-Trace-Context", h)
}
return fromContext(ContextForTesting(req))
}