Skip to content

Commit 4fd4d89

Browse files
committed
nat suggestions
1 parent f4cce8f commit 4fd4d89

File tree

3 files changed

+7
-20
lines changed

3 files changed

+7
-20
lines changed

.github/workflows/version_bump_options.json renamed to .github/version_bump_options.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
"branch": "main",
1515
"tag": true,
1616
"reset": "build"
17-
},
18-
{
19-
"trigger": "commit",
20-
"bump": "major",
21-
"branch": "release",
22-
"tag": true,
23-
"reset": ["minor", "build"]
2417
}
2518
]
2619
}

.github/workflows/pkgdown_dev.yaml renamed to .github/workflows/pkgdown.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
- name: Build site
4141
env:
4242
DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIPROCESS_GHACTIONS_DELPHI_EPIDATA_KEY }}
43-
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE, override=list(PKGDOWN_DEV_MODE="devel"))
43+
run: |
44+
mode <- ifelse("${{ GITHUB_BASE_REF }}" == "main", "release", "devel")
45+
pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE, override=list(PKGDOWN_DEV_MODE=mode))
4446
shell: Rscript {0}
4547

4648
- name: Deploy to GitHub pages 🚀

.github/workflows/release-helper.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v3
1515
with:
1616
ref: dev
17+
fetch-depth: 0
1718
ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
1819
- name: Reset dev branch
1920
run: |
2021
git fetch origin main:main
21-
git reset --hard main
22-
- name: Create pull request into dev
23-
uses: peter-evans/create-pull-request@v3
24-
with:
25-
branch: bot/sync-main-dev
26-
commit-message: "chore: sync main-dev"
27-
base: dev
28-
title: "chore: sync main->dev"
29-
labels: chore
30-
body: |
31-
Syncing Main->Dev.
22+
git merge main
23+
git push

0 commit comments

Comments
 (0)