From 47b20fa3f96879b31d06905ec3ba15abb99df0b2 Mon Sep 17 00:00:00 2001 From: Jared Knipp Date: Fri, 26 Apr 2024 16:21:51 -0500 Subject: [PATCH] Update GHA to use main branch --- .github/workflows/main.yml | 4 ++-- lib/tasks/deploy.rake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b499a3b2..cff0c19f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,10 +3,10 @@ name: Docker Build and Push # 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 main branch on: push: - branches: [ master ] + branches: [ main ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/lib/tasks/deploy.rake b/lib/tasks/deploy.rake index ff246078..acd6177a 100644 --- a/lib/tasks/deploy.rake +++ b/lib/tasks/deploy.rake @@ -1,5 +1,5 @@ desc "Deploy this sample app to heroku" task :deploy do - `git push heroku master` + `git push heroku main` end