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

Roxygen workflow improvements #215

Merged
merged 6 commits into from
Feb 22, 2024
Merged

Roxygen workflow improvements #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5afa923
Roxygen workflow improvements
walkowif Feb 22, 2024
01a9d37
Don't set AUTO_UPDATE to failed if git push didn't fail
walkowif Feb 22, 2024
f7ed465
Actually use REPO_GITHUB_TOKEN to commit changes
walkowif Feb 22, 2024
ba3e194
Merge branch 'main' into roxygen-workflow-improvements
walkowif Feb 22, 2024
d1df0ff
Update commit messages
walkowif Feb 22, 2024
3834c31
Merge branch 'roxygen-workflow-improvements' of github.com:insightsen…
walkowif Feb 22, 2024
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
9 changes: 5 additions & 4 deletions .github/workflows/roxygen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
ref: ${{ steps.branch-name.outputs.head_ref_branch }}
path: ${{ github.event.repository.name }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
token: ${{ steps.github-token.outputs.token }}

- name: Checkout repo 🛎
uses: actions/checkout@v4
Expand Down Expand Up @@ -151,13 +152,13 @@ jobs:
echo "Regenerating man pages via auto-update"
git config --global user.name "github-actions"
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add man/* DESCRIPTION
git commit -m "[skip actions] Roxygen Man Pages Auto Update"
git add -A man/ DESCRIPTION
git commit -m "Roxygen Man Pages Auto Update"
BRANCH_NAME="${{ steps.branch-name.outputs.head_ref_branch }}"
git pull origin ${BRANCH_NAME}
git push -v origin HEAD:${BRANCH_NAME} || \
echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)" && \
AUTO_UPDATE=failed
(echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)" && \
AUTO_UPDATE=failed)
}
fi
# If auto-update is disabled or is unsuccessful, let 'em know to fix manually
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spelling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
if: github.event_name == 'push'
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "[skip actions] Update WORDLIST"
commit_message: "Update WORDLIST"
file_pattern: "${{ steps.file-pattern.outputs.file-pattern }}"
commit_user_name: github-actions
commit_user_email: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
git config --global user.name 'github-actions'
git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
git add ${{ steps.problem-files.outputs.unstyled-files }}
git commit -m '[skip actions] Restyle files'
git commit -m 'Restyle files'
git pull origin ${{ steps.branch-name.outputs.head_ref_branch }}
git push -v origin HEAD:${{ steps.branch-name.outputs.head_ref_branch }} || \
echo "⚠️ Could not push to ${BRANCH_NAME} on $(git remote -v show -n origin | grep Push)"
Expand Down
Loading