From 543abbe669f8f1da3323bb6bccf9b0b2c9579d77 Mon Sep 17 00:00:00 2001 From: David Karlsson Date: Wed, 19 Oct 2022 16:18:18 +0200 Subject: [PATCH] updated gha workflows --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7277d56550..95e8e0fad6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: # needs push event on default branch otherwise cache is evicted when pull request is merged branches: - - master + - main pull_request: permissions: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a4b381dd13..060ce88366 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -5,7 +5,7 @@ on: push: branches: - lab - - master + - main - published # these permissions are needed to interact with GitHub's OIDC Token endpoint. @@ -22,14 +22,14 @@ jobs: run: | JEKYLL_ENV=development DOCS_AWS_REGION=us-east-1 - if [ "${{ github.ref }}" = "refs/heads/master" ]; then + if [ "${{ github.ref }}" = "refs/heads/main" ]; then DOCS_URL="https://docs-stage.docker.com" DOCS_AWS_IAM_ROLE="arn:aws:iam::710015040892:role/stage-docs-docs.docker.com-20220818202135984800000001" DOCS_S3_BUCKET="stage-docs-docs.docker.com" DOCS_S3_CONFIG="s3-config.json" DOCS_CLOUDFRONT_ID="E1R7CSW3F0X4H8" DOCS_LAMBDA_FUNCTION_REDIRECTS="DockerDocsRedirectFunction-stage" - DOCS_SLACK_MSG="Successfully deployed docs-stage from master branch. $DOCS_URL" + DOCS_SLACK_MSG="Successfully deployed docs-stage from main branch. $DOCS_URL" elif [ "${{ github.ref }}" = "refs/heads/published" ]; then JEKYLL_ENV=production DOCS_URL="https://docs.docker.com"