Skip to content

Commit

Permalink
Merge branch 'main' into gh-actions-update-1711800303
Browse files Browse the repository at this point in the history
  • Loading branch information
jimbrig authored Jun 8, 2024
2 parents 25e6f32 + cea5887 commit db30741
Show file tree
Hide file tree
Showing 16 changed files with 77 additions and 49 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Automate Changelog
on:
workflow_dispatch:
push:
branches: [ main ]
paths-ignore:
- CHANGELOG.md
- .github/**
pull_request:
branches: [ $default-branch ]
types: [ opened, synchronize, closed ]
jobs:
changelog:
name: Generate Changelog
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
- name: Run Git Cliff
uses: tj-actions/[email protected]
id: git-cliff
with:
args: "--verbose"
output: "CHANGELOG.md"
template-config: https://raw.githubusercontent.com/noclocks/.github/main/workflow-templates/cliff.template.toml
- name: Print Changelog
id: print-changelog
run: |
cat "CHANGELOG.md"
# Commit and push the updated changelog, IF not a pull request
- name: Commit and Push Changelog
if: github.event_name != 'pull_request'
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
set +e
git add CHANGELOG.md
git commit -m "[chore]: update changelog"
git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git "main"
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
- uses: r-lib/actions/setup-pandoc@v2
- uses: r-lib/actions/setup-r@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
CODCOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4

- uses: r-lib/actions/setup-r@v2
with:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:

- name: Upload test results
if: failure()
uses: actions/[email protected].1
uses: actions/[email protected].3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
13 changes: 13 additions & 0 deletions .github/workflows/dependabot-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Dependabot Auto-Merge
on:
pull_request:
types: [opened, reopened]
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
uses: jimbrig/ghactions/.github/workflows/dependabot-merge.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
- name: Publish to Registry
uses: elgohr/Publish-Docker-Github-Action@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/[email protected].2
uses: actions/[email protected].4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
- name: Create a Release
uses: elgohr/Github-Release-Action@20231116201936
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gha-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
with:
token: ${{ secrets.WORKFLOW_SECRET }}

Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/git-cliff.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
labels:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
- uses: micnncim/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linguist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Run linguist
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4
- uses: fabasoad/[email protected]
id: linguist
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4

- uses: r-lib/actions/setup-r@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lintr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/[email protected].2
uses: actions/[email protected].4

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/[email protected].2
- uses: actions/[email protected].4

- uses: r-lib/actions/setup-pandoc@v2

Expand All @@ -39,7 +39,7 @@ jobs:

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.5.0
uses: JamesIves/github-pages-deploy-action@v4.6.1
with:
clean: false
branch: gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/[email protected].2
uses: actions/[email protected].4
with:
fetch-depth: 0

Expand Down
8 changes: 8 additions & 0 deletions inst/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,20 @@ All notable changes to this project will be documented in this file.
- Autopublish 2024-03-05T21:52:23Z
- Autopublish 2024-03-15T20:27:49Z
- Autopublish 2024-03-15T21:09:29Z
- Autopublish 2024-03-15T21:10:44Z
- Autopublish 2024-04-01T14:16:20Z
- Autopublish 2024-04-30T01:53:15Z
- Autopublish 2024-04-30T15:09:33Z
- Autopublish 2024-05-27T19:47:45Z
- Autopublish 2024-06-08T01:32:59Z
- Autopublish 2024-06-08T01:33:41Z

### Refactor

- Refactor data-raw data preparation scripts
- Update pkgdevt.R
- Refactor R folder contents and file names
- Fix dependabot-merge.yml

### Bug

Expand Down

0 comments on commit db30741

Please sign in to comment.