Revert "Rename workflows and branches to main (#449)" (#452)

This reverts commit 190711d66f.
This commit is contained in:
Seth Vargo 2021-12-22 13:54:08 -05:00 committed by GitHub
parent 190711d66f
commit d4f608db25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 25 deletions

View file

@ -3,7 +3,7 @@ name: 'release'
on:
push:
branches:
- 'main'
- 'master'
workflow_dispatch:
jobs:

View file

@ -3,10 +3,10 @@ name: setup-gcloud Integration
on:
push:
branches:
- 'main'
- 'master'
pull_request:
branches:
- 'main'
- 'master'
concurrency:
group: '${{github.workflow}}-${{ github.head_ref || github.ref }}'
@ -213,7 +213,7 @@ jobs:
- name: 'setup-gcloud'
uses: './'
- id: 'gcloud'
shell: 'bash'
run: |-
@ -250,7 +250,7 @@ jobs:
- name: 'setup-gcloud'
uses: './'
- id: 'gcloud'
shell: 'bash'
run: |-
@ -287,7 +287,7 @@ jobs:
uses: './'
with:
export_default_credentials: true
- id: 'gcloud'
shell: 'bash'
run: |-
@ -304,7 +304,7 @@ jobs:
- 'ubuntu-latest'
- 'windows-latest'
- 'macos-latest'
permissions:
id-token: 'write'
@ -349,3 +349,4 @@ jobs:
run: |-
CURRENT_SA=$(gcloud auth list --format="value(account)" --filter="(status=ACTIVE)")
if [ ${{ secrets.SETUP_GCLOUD_IT_EMAIL }} != $CURRENT_SA ]; then exit 1; fi

View file

@ -3,10 +3,10 @@ name: setup-gcloud Unit
on:
push:
branches:
- 'main'
- 'master'
pull_request:
branches:
- 'main'
- 'master'
concurrency:

6
.gitignore vendored
View file

@ -2,9 +2,9 @@
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
#
#
# https://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software distributed under the License
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied. See the License for the specific language governing permissions and limitations under the
@ -65,7 +65,7 @@ Thumbs.db
node_modules/
runner/
# Rest of the file pulled from https://github.com/github/gitignore/blob/main/Node.gitignore
# Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
# Logs
logs
*.log

View file

@ -36,15 +36,15 @@ action has it's own repo and this repo is only for setup-gcloud**
```diff
steps:
- id: gcloud
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@main
+ uses: google-github-actions/setup-gcloud@v0
- uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+ uses: google-github-actions/setup-gcloud@master
```
### Or google-github-actions/{action}
```diff
steps:
- id: deploy
- uses: GoogleCloudPlatform/github-actions/deploy-cloudrun@main
- uses: GoogleCloudPlatform/github-actions/deploy-cloudrun@master
+ uses: google-github-actions/deploy-cloudrun@main
```

View file

@ -25,4 +25,4 @@ update values to match your setup.
Learn more about [Automating your workflow with Github Actions](https://help.github.com/en/actions/automating-your-workflow-with-github-actions).
[action]: https://github.com/GoogleCloudPlatform/github-actions/tree/main/setup-gcloud
[action]: https://github.com/GoogleCloudPlatform/github-actions/tree/master/setup-gcloud

View file

@ -17,7 +17,7 @@ name: Build using Cloud Build
on:
push:
branches:
- 'main'
- master
env:
PROJECT_ID: ${{ secrets.RUN_PROJECT }}

View file

@ -8,7 +8,7 @@ update values to match your setup.
## Workflow description
For pushes to the `main` branch, this workflow will:
For pushes to the `master` branch, this workflow will:
1. Download and configure the Google [Cloud SDK][sdk] with the provided
credentials.
@ -69,14 +69,14 @@ For pushes to the `main` branch, this workflow will:
$ git commit -m "Set up GitHub workflow"
```
1. Push to the `main` branch:
1. Push to the `master` branch:
```text
$ git push -u origin main
$ git push -u origin master
```
1. View the GitHub Actions Workflow by selecting the `Actions` tab at the top
of your repository on GitHub. Then click on the `Build using Cloud Build`
of your repository on GitHub. Then click on the `Build using Cloud Build`
element to see the details.
[actions]: https://help.github.com/en/categories/automating-your-workflow-with-github-actions

View file

@ -17,7 +17,7 @@ name: Build and Deploy to Google Compute Engine
on:
push:
branches:
- 'main'
- master
env:
PROJECT_ID: ${{ secrets.GCE_PROJECT }}

View file

@ -8,7 +8,7 @@ update values to match your setup.
## Workflow description
For pushes to the `main` branch, this workflow will:
For pushes to the `master` branch, this workflow will:
1. Download and configure the Google [Cloud SDK][sdk] with the provided
credentials.
@ -83,10 +83,10 @@ For pushes to the `main` branch, this workflow will:
$ git commit -m "Set up GitHub workflow"
```
1. Push to the `main` branch:
1. Push to the `master` branch:
```text
$ git push -u origin main
$ git push -u origin master
```
1. View the GitHub Actions Workflow by selecting the `Actions` tab at the top