Skip to content

Commit

Permalink
Merge pull request #273 from materialsproject/dev
Browse files Browse the repository at this point in the history
Fix broken doc release / changelog
  • Loading branch information
mattmcdermott authored Sep 1, 2023
2 parents fcc5cd9 + b3f0b0f commit 4be8a4c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 21 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/post-process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,12 @@ on:
- "testing"

jobs:
merge-me:
name: Merge me!
runs-on: ubuntu-latest
steps:
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Merge me!
uses: ridedott/merge-me-action@v2
with:
GITHUB_TOKEN: ${{ secrets.SEMVER_BUMP_TOKEN}}

auto-gen-release:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.SEMVER_BUMP_TOKEN }}
steps:
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
uses: rymndhng/release-on-push-action@v0.27.0
uses: rymndhng/release-on-push-action@v0.28.0
with:
bump_version_scheme: norelease
17 changes: 8 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,25 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install -e .[strict,docs]
pip install auto-changelog
- name: Generate changelog
uses: charmixer/auto-changelog-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
exclude_labels: dependencies

run: |
auto-changelog --tag-prefix "v"
- name: Commit files
env:
CI_USER: ${{ secrets.GITHUB_USER }}
CI_EMAIL: ${{ secrets.GITHUB_EMAIL }}
CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
CI_EMAIL: ${{ secrets.YOUR_GITHUB_EMAIL }}
run: |
git config --local user.email "$CI_EMAIL"
git config --local user.name "$CI_USER"
git add CHANGELOG.md && git commit -m 'Updated CHANGELOG.md' && echo "push=true" >> $GITHUB_ENV || echo "No changes to CHANGELOG.md"
- name: Push changes
if: env.push == 'true'
env:
CI_USER: ${{ secrets.GITHUB_USER }}
CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
CI_TOKEN: ${{ secrets.GITHUB_TOKEN}}
run: |
git push "https://$CI_USER:$CI_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:main
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks

0 comments on commit 4be8a4c

Please sign in to comment.