Skip to content

Commit

Permalink
Update README and CI to use latest version (#665)
Browse files Browse the repository at this point in the history
  • Loading branch information
sethvargo committed Dec 13, 2023
1 parent 8251968 commit 87d5265
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:

# Authenticate via WIF
- name: 'Authenticate via WIF'
uses: 'google-github-actions/auth@main'
uses: 'google-github-actions/auth@v2'
with:
workload_identity_provider: '${{ vars.WIF_PROVIDER_NAME }}'
service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
Expand All @@ -111,7 +111,7 @@ jobs:

# Authenticate via SAKE
- name: 'Authenticate via SAKE'
uses: 'google-github-actions/auth@main'
uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.SERVICE_ACCOUNT_KEY_JSON }}'

Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:

steps:
- id: 'auth'
uses: 'google-github-actions/auth@v1'
uses: 'google-github-actions/auth@v2'
with:
workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider'
service_account: 'my-service-account@my-project.iam.gserviceaccount.com'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'
with:
version: '>= 363.0.0'

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
install the latest available Cloud SDK version.

```yaml
- uses: 'google-github-actions/setup-gcloud@v1'
- uses: 'google-github-actions/setup-gcloud@v2'
with:
version: '>= 416.0.0'
```
Expand All @@ -89,7 +89,7 @@ jobs:
version constraint as such:

```yaml
- uses: 'google-github-actions/setup-gcloud@v1'
- uses: 'google-github-actions/setup-gcloud@v2'
with:
version: '>= 363.0.0'
```
Expand Down Expand Up @@ -133,13 +133,13 @@ jobs:

steps:
- id: 'auth'
uses: 'google-github-actions/auth@v1'
uses: 'google-github-actions/auth@v2'
with:
workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider'
service_account: 'my-service-account@my-project.iam.gserviceaccount.com'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'

- name: 'Use gcloud CLI'
run: 'gcloud info'
Expand All @@ -152,12 +152,12 @@ job:
job_id:
steps:
- id: 'auth'
uses: 'google-github-actions/auth@v1'
uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.GCP_CREDENTIALS }}'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'

- name: 'Use gcloud CLI'
run: 'gcloud info'
Expand All @@ -173,7 +173,7 @@ job:
job_id:
steps:
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'

- name: 'Use gcloud CLI'
run: 'gcloud info'
Expand All @@ -193,25 +193,25 @@ jobs:

steps:
- id: 'auth service account 1'
uses: 'google-github-actions/auth@v1'
uses: 'google-github-actions/auth@v2'
with:
workload_identity_provider: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider'
service_account: 'service-account-1@my-project.iam.gserviceaccount.com'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'

- name: 'Use gcloud CLI'
run: 'gcloud auth list --filter=status:ACTIVE --format="value(account)"'
# service-account-1@my-project.iam.gserviceaccount.com

- id: 'auth service account 2'
uses: 'google-github-actions/auth@v1'
uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.GCP_CREDENTIALS }}'

- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v1'
uses: 'google-github-actions/setup-gcloud@v2'

- name: 'Use gcloud CLI'
run: 'gcloud auth list --filter=status:ACTIVE --format="value(account)"'
Expand All @@ -224,15 +224,15 @@ jobs:
We recommend pinning to the latest available major version:

```yaml
- uses: 'google-github-actions/setup-gcloud@v1'
- uses: 'google-github-actions/setup-gcloud@v2'
```

While this action attempts to follow semantic versioning, but we're ultimately
human and sometimes make mistakes. To prevent accidental breaking changes, you
can also pin to a specific version:

```yaml
- uses: 'google-github-actions/setup-gcloud@v1.0.0'
- uses: 'google-github-actions/setup-gcloud@v2.0.0'
```

However, you will not get automatic security updates or new features without
Expand Down

0 comments on commit 87d5265

Please sign in to comment.