Skip to content

Commit 8fd8c98

Browse files
committed
ENH fix deploy
1 parent ea34d15 commit 8fd8c98

File tree

2 files changed

+30
-20
lines changed

2 files changed

+30
-20
lines changed

.ci_scripts/update_docs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ mv docs-README docs/README
3131

3232
# git diff
3333

34-
# Only commit the docs for commits on master.
35-
if [[ $GH_REF == refs/heads/master ]] && [[ $GH_TOKEN != "" ]]; then
36-
git add -A :/
37-
git commit -m "Re-ran make.py. [ci skip]" || true
38-
git remote add pushable https://${GH_TOKEN}@github.com/conda-forge/conda-forge.github.io.git/ > /dev/null
39-
40-
# Update the remotes before pushing and check the status.
41-
# This should give us more info if the push will not be
42-
# a simple fast-forward push.
43-
git fetch --all 2> /dev/null
44-
git branch -u pushable/gh-pages
45-
git status
46-
git push pushable new_site_content:gh-pages
47-
# 2> /dev/null
48-
fi
34+
# # Only commit the docs for commits on master.
35+
# if [[ $GH_REF == refs/heads/master ]] && [[ $GH_TOKEN != "" ]]; then
36+
# git add -A :/
37+
# git commit -m "Re-ran make.py. [ci skip]" || true
38+
# git remote add pushable https://${GH_TOKEN}@github.com/conda-forge/conda-forge.github.io.git/ > /dev/null
39+
#
40+
# # Update the remotes before pushing and check the status.
41+
# # This should give us more info if the push will not be
42+
# # a simple fast-forward push.
43+
# git fetch --all 2> /dev/null
44+
# git branch -u pushable/gh-pages
45+
# git status
46+
# git push pushable new_site_content:gh-pages
47+
# # 2> /dev/null
48+
# fi

.github/workflows/deploy.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: deploy
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- master
77
pull_request: null
88

@@ -31,10 +31,20 @@ jobs:
3131
conda config --set show_channel_urls true
3232
conda config --set auto_update_conda false
3333
34-
- name: build and deploy
34+
- name: build
3535
shell: bash -l {0}
3636
run: |
3737
source ./.ci_scripts/update_docs
38-
env:
39-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40-
GH_REF: ${{ github.ref }}
38+
# env:
39+
# GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
# GH_REF: ${{ github.ref }}
41+
42+
- name: deploy
43+
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
44+
uses: peaceiris/actions-gh-pages@v3
45+
with:
46+
github_token: ${{ secrets.GITHUB_TOKEN }}
47+
publish_branch: gh-pages
48+
publish_dir: .
49+
user_name: cf-blacksmithy
50+
user_email: [email protected]

0 commit comments

Comments
 (0)