Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prep change for changing def branch to main #4306

Merged
merged 1 commit into from
Aug 23, 2021
Merged

Prep change for changing def branch to main #4306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prep change for changing def branch to main
  • Loading branch information
@malfet
malfet committed Aug 23, 2021
commit 27ff570eaed692b69ec7a9edc3494b87ed7c55f8
4 changes: 2 additions & 2 deletions .circleci/build_docs/commit_docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -ex
if [ "$2" == "" ]; then
echo call as "$0" "<src>" "<target branch>"
echo where src is the root of the built documentation git checkout and
echo branch should be "master" or "1.7" or so
echo branch should be "main" or "1.7" or so
exit 1
fi

Expand All @@ -20,7 +20,7 @@ git checkout gh-pages
mkdir -p ./"${target}"
rm -rf ./"${target}"/*
cp -r "${src}/docs/build/html/"* ./"$target"
if [ "${target}" == "master" ]; then
if [ "${target}" == "main" ]; then
mkdir -p ./_static
rm -rf ./_static/*
cp -r "${src}/docs/build/html/_static/"* ./_static
Expand Down
76 changes: 38 additions & 38 deletions .circleci/config.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .circleci/config.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ commands:
# command: |
# set -ex
# BRANCH=$(git rev-parse --abbrev-ref HEAD)
# if [[ "$BRANCH" != "master" ]]; then
# if [[ "$BRANCH" != "main" ]]; then
# git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
# git checkout "merged/$CIRCLE_BRANCH"
# fi
Expand Down Expand Up @@ -936,7 +936,7 @@ jobs:
command: |
set -ex
tag=${CIRCLE_TAG:1:5}
VERSION=${tag:-master}
VERSION=${tag:-main}
eval "$(./conda/bin/conda shell.bash hook)"
conda activate ./env
pushd docs
Expand Down Expand Up @@ -982,7 +982,7 @@ jobs:
# https://circleci.com/docs/2.0/configuration-reference/#checkout
set -ex
tag=${CIRCLE_TAG:1:5}
target=${tag:-master}
target=${tag:-main}
~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target


Expand Down Expand Up @@ -1029,7 +1029,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- smoke_test_docker_image_build:
context: org-member
Loading