From abf7f258d1d84c79ad067c704e069c8cf7d8d2d0 Mon Sep 17 00:00:00 2001 From: Christopher Schleiden Date: Mon, 13 Jul 2020 12:12:41 -0700 Subject: [PATCH 1/2] Use $default-branch token --- ci/android.yml | 4 ++-- ci/ant.yml | 4 ++-- ci/blank.yml | 6 +++--- ci/c-cpp.yml | 4 ++-- ci/clojure.yml | 4 ++-- ci/crystal.yml | 4 ++-- ci/dart.yml | 4 ++-- ci/django.yml | 4 ++-- ci/docker-image.yml | 4 ++-- ci/docker-publish.yml | 8 ++++---- ci/dotnet-core-desktop.yml | 16 ++++++++-------- ci/dotnet-core.yml | 4 ++-- ci/elixir.yml | 6 +++--- ci/erlang.yml | 4 ++-- ci/gem-push.yml | 4 ++-- ci/go.yml | 4 ++-- ci/gradle.yml | 4 ++-- ci/haskell.yml | 4 ++-- ci/jekyll.yml | 4 ++-- ci/laravel.yml | 6 +++--- ci/maven.yml | 4 ++-- ci/node.js.yml | 4 ++-- ci/php.yml | 6 +++--- ci/python-app.yml | 4 ++-- ci/python-package.yml | 4 ++-- ci/ruby.yml | 4 ++-- ci/rust.yml | 4 ++-- ci/scala.yml | 4 ++-- ci/swift.yml | 4 ++-- ci/terraform.yml | 12 ++++++------ 30 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ci/android.yml b/ci/android.yml index 7ec0147..c88c515 100644 --- a/ci/android.yml +++ b/ci/android.yml @@ -2,9 +2,9 @@ name: Android CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/ant.yml b/ci/ant.yml index efebba5..28fe6d0 100644 --- a/ci/ant.yml +++ b/ci/ant.yml @@ -5,9 +5,9 @@ name: Java CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/blank.yml b/ci/blank.yml index d6783e2..72f1f16 100644 --- a/ci/blank.yml +++ b/ci/blank.yml @@ -3,12 +3,12 @@ name: CI # Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch +# events but only for the $default-branch branch on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/ci/c-cpp.yml b/ci/c-cpp.yml index e323326..88d1497 100644 --- a/ci/c-cpp.yml +++ b/ci/c-cpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/clojure.yml b/ci/clojure.yml index 22bfe20..098918a 100644 --- a/ci/clojure.yml +++ b/ci/clojure.yml @@ -2,9 +2,9 @@ name: Clojure CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/crystal.yml b/ci/crystal.yml index ce9dbfc..6552afa 100644 --- a/ci/crystal.yml +++ b/ci/crystal.yml @@ -2,9 +2,9 @@ name: Crystal CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/dart.yml b/ci/dart.yml index 11e18c7..6e1b2e3 100644 --- a/ci/dart.yml +++ b/ci/dart.yml @@ -2,9 +2,9 @@ name: Dart CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/django.yml b/ci/django.yml index c806047..b9d5315 100644 --- a/ci/django.yml +++ b/ci/django.yml @@ -2,9 +2,9 @@ name: Django CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/docker-image.yml b/ci/docker-image.yml index e57d42a..78532a3 100644 --- a/ci/docker-image.yml +++ b/ci/docker-image.yml @@ -2,9 +2,9 @@ name: Docker Image CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: diff --git a/ci/docker-publish.yml b/ci/docker-publish.yml index 9e80e76..76756db 100644 --- a/ci/docker-publish.yml +++ b/ci/docker-publish.yml @@ -2,9 +2,9 @@ name: Docker on: push: - # Publish `master` as Docker `latest` image. + # Publish `$default-branch` as Docker `latest` image. branches: - - master + - $default-branch # Publish `v1.2.3` tags as releases. tags: @@ -56,7 +56,7 @@ jobs: - name: Push image run: | IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME - + # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') @@ -67,7 +67,7 @@ jobs: [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') # Use Docker `latest` tag convention - [ "$VERSION" == "master" ] && VERSION=latest + [ "$VERSION" == "$default-branch" ] && VERSION=latest echo IMAGE_ID=$IMAGE_ID echo VERSION=$VERSION diff --git a/ci/dotnet-core-desktop.yml b/ci/dotnet-core-desktop.yml index ed37b70..341576c 100644 --- a/ci/dotnet-core-desktop.yml +++ b/ci/dotnet-core-desktop.yml @@ -11,22 +11,22 @@ # To configure this workflow: # # 1. Configure environment variables -# GitHub sets default environment variables for every workflow run. +# GitHub sets default environment variables for every workflow run. # Replace the variables relative to your project in the "env" section below. -# +# # 2. Signing -# Generate a signing certificate in the Windows Application +# Generate a signing certificate in the Windows Application # Packaging Project or add an existing signing certificate to the project. # Next, use PowerShell to encode the .pfx file using Base64 encoding # by running the following Powershell script to generate the output string: -# +# # $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte # [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' # # Open the output file, SigningCertificate_Encoded.txt, and copy the # string inside. Then, add the string to the repo as a GitHub secret # and name it "Base64_Encoded_Pfx." -# For more information on how to configure your signing certificate for +# For more information on how to configure your signing certificate for # this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing # # Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". @@ -40,9 +40,9 @@ name: .NET Core Desktop on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: @@ -52,7 +52,7 @@ jobs: matrix: configuration: [Debug, Release] - runs-on: windows-latest # For a list of available runner types, refer to + runs-on: windows-latest # For a list of available runner types, refer to # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on env: diff --git a/ci/dotnet-core.yml b/ci/dotnet-core.yml index f734ea7..03958b6 100644 --- a/ci/dotnet-core.yml +++ b/ci/dotnet-core.yml @@ -2,9 +2,9 @@ name: .NET Core on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/elixir.yml b/ci/elixir.yml index 4b3e78f..76dd26d 100644 --- a/ci/elixir.yml +++ b/ci/elixir.yml @@ -2,10 +2,10 @@ name: Elixir CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] - + branches: [ $default-branch ] + jobs: build: diff --git a/ci/erlang.yml b/ci/erlang.yml index fd28497..25cb893 100644 --- a/ci/erlang.yml +++ b/ci/erlang.yml @@ -2,9 +2,9 @@ name: Erlang CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: diff --git a/ci/gem-push.yml b/ci/gem-push.yml index 08733c7..f9b64e8 100644 --- a/ci/gem-push.yml +++ b/ci/gem-push.yml @@ -2,9 +2,9 @@ name: Ruby Gem on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/go.yml b/ci/go.yml index d31e87f..3fa9348 100644 --- a/ci/go.yml +++ b/ci/go.yml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: diff --git a/ci/gradle.yml b/ci/gradle.yml index 58e1c59..4550f58 100644 --- a/ci/gradle.yml +++ b/ci/gradle.yml @@ -5,9 +5,9 @@ name: Java CI with Gradle on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/haskell.yml b/ci/haskell.yml index 4bc2d16..4c9a50c 100644 --- a/ci/haskell.yml +++ b/ci/haskell.yml @@ -2,9 +2,9 @@ name: Haskell CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/jekyll.yml b/ci/jekyll.yml index 64df081..9449a6e 100644 --- a/ci/jekyll.yml +++ b/ci/jekyll.yml @@ -2,9 +2,9 @@ name: Jekyll site CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/laravel.yml b/ci/laravel.yml index a895246..b32ad88 100644 --- a/ci/laravel.yml +++ b/ci/laravel.yml @@ -2,15 +2,15 @@ name: Laravel on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: laravel-tests: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v2 - name: Copy .env diff --git a/ci/maven.yml b/ci/maven.yml index c8aeb3a..a46556a 100644 --- a/ci/maven.yml +++ b/ci/maven.yml @@ -5,9 +5,9 @@ name: Java CI with Maven on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/node.js.yml b/ci/node.js.yml index 673bd33..ce0cdcf 100644 --- a/ci/node.js.yml +++ b/ci/node.js.yml @@ -5,9 +5,9 @@ name: Node.js CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/php.yml b/ci/php.yml index 839187e..5053b43 100644 --- a/ci/php.yml +++ b/ci/php.yml @@ -2,9 +2,9 @@ name: PHP Composer on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: @@ -16,7 +16,7 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - + - name: Cache Composer packages id: composer-cache uses: actions/cache@v2 diff --git a/ci/python-app.yml b/ci/python-app.yml index c7f5067..3b3e6a6 100644 --- a/ci/python-app.yml +++ b/ci/python-app.yml @@ -5,9 +5,9 @@ name: Python application on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/python-package.yml b/ci/python-package.yml index f1abc2f..c4a1081 100644 --- a/ci/python-package.yml +++ b/ci/python-package.yml @@ -5,9 +5,9 @@ name: Python package on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/ruby.yml b/ci/ruby.yml index 76c166e..7f3bdd6 100644 --- a/ci/ruby.yml +++ b/ci/ruby.yml @@ -9,9 +9,9 @@ name: Ruby on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: test: diff --git a/ci/rust.yml b/ci/rust.yml index 3c13d1b..6c82c61 100644 --- a/ci/rust.yml +++ b/ci/rust.yml @@ -2,9 +2,9 @@ name: Rust on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] env: CARGO_TERM_COLOR: always diff --git a/ci/scala.yml b/ci/scala.yml index f182d0c..96bfc70 100644 --- a/ci/scala.yml +++ b/ci/scala.yml @@ -2,9 +2,9 @@ name: Scala CI on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/swift.yml b/ci/swift.yml index 5dbdb4f..df062b5 100644 --- a/ci/swift.yml +++ b/ci/swift.yml @@ -2,9 +2,9 @@ name: Swift on: push: - branches: [ master ] + branches: [ $default-branch ] pull_request: - branches: [ master ] + branches: [ $default-branch ] jobs: build: diff --git a/ci/terraform.yml b/ci/terraform.yml index 148f2e2..7fc401b 100644 --- a/ci/terraform.yml +++ b/ci/terraform.yml @@ -1,7 +1,7 @@ # This workflow installs the latest version of Terraform CLI and configures the Terraform CLI configuration file # with an API token for Terraform Cloud (app.terraform.io). On pull request events, this workflow will run # `terraform init`, `terraform fmt`, and `terraform plan` (speculative plan via Terraform Cloud). On push events -# to the master branch, `terraform apply` will be executed. +# to the $default-branch branch, `terraform apply` will be executed. # # Documentation for `hashicorp/setup-terraform` is located here: https://github.com/hashicorp/setup-terraform # @@ -47,7 +47,7 @@ name: 'Terraform' on: push: branches: - - master + - $default-branch pull_request: jobs: @@ -65,7 +65,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token + # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: @@ -82,9 +82,9 @@ jobs: # Generates an execution plan for Terraform - name: Terraform Plan run: terraform plan - - # On push to master, build or change infrastructure according to Terraform configuration files + + # On push to $default-branch, build or change infrastructure according to Terraform configuration files # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks - name: Terraform Apply - if: github.ref == 'refs/heads/master' && github.event_name == 'push' + if: github.ref == 'refs/heads/$default-branch' && github.event_name == 'push' run: terraform apply -auto-approve From 7ed78293f73a2b40e29a46a4b3be386c8c534b6b Mon Sep 17 00:00:00 2001 From: Christopher Schleiden Date: Mon, 13 Jul 2020 12:13:03 -0700 Subject: [PATCH 2/2] Use repository link --- automation/label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/label.yml b/automation/label.yml index e90b599..7c724a6 100644 --- a/automation/label.yml +++ b/automation/label.yml @@ -3,7 +3,7 @@ # # To use this workflow, you will need to set up a .github/labeler.yml # file with configuration. For more information, see: -# https://github.com/actions/labeler/blob/master/README.md +# https://github.com/actions/labeler name: Labeler on: [pull_request]