Skip to content

Commit

Permalink
Update branch for actions (#619)
Browse files Browse the repository at this point in the history
* Update branch for actions

* Fix branch names
  • Loading branch information
forsyth2 authored Aug 31, 2022
1 parent e15610c commit aaf03b5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: CI/CD Build Workflow

on:
push:
branches: [master]
branches: [main]

pull_request:
branches: [master]
branches: [main]

workflow_dispatch:

Expand Down Expand Up @@ -139,10 +139,10 @@ jobs:
# gh-pages branch must already exist
git clone https://github.com/E3SM-Project/e3sm_diags.git --branch gh-pages --single-branch gh-pages
# Only replace master docs with latest changes. Docs for tags should be untouched.
# Only replace main docs with latest changes. Docs for tags should be untouched.
cd gh-pages
rm -r _build/html/master
cp -r ../docs/_build/html/master _build/html/master
rm -r _build/html/main
cp -r ../docs/_build/html/main _build/html/main
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
git clone https://github.com/E3SM-Project/e3sm_diags.git --branch gh-pages --single-branch gh-pages
cd gh-pages
# Replace master docs to populate dropdown with latest tags
rm -r _build/html/master
# Only copy docs for master and current tag
# Replace main docs to populate dropdown with latest tags
rm -r _build/html/main
# Only copy docs for main and current tag
cp -r -n ../docs/_build/html _build/
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
Expand Down

0 comments on commit aaf03b5

Please sign in to comment.