Skip to content

Commit 3d4789a

Browse files
chore(syncweaver): update tracked sources from CCBR/MOSuite@v0.4.0 (#15)
Co-authored-by: kelly-sovacool <17768269+kelly-sovacool@users.noreply.github.com>
1 parent d4e9b43 commit 3d4789a

115 files changed

Lines changed: 6232 additions & 1050 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.syncweaver-lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"sources": {
66
"code/MOSuite": {
77
"repo_url": "https://github.com/CCBR/MOSuite",
8-
"ref": "main",
9-
"git_sha": "c09ee39f9b282237f13d88dcf4cdfed965209c68"
8+
"ref": "v0.4.0",
9+
"git_sha": "ef1bdf806d153515e8ecbb8a8d2bfc518a418e05"
1010
}
1111
}
1212
}

‎code/MOSuite/.Rbuildignore‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
^renv$
2-
^renv\.lock$
31
^_pkgdown\.yml$
2+
^[.]?air[.]toml$
43
^\.github$
54
^\.lintr$
5+
^\.posit$
66
^\.pre-commit-config\.yaml$
77
^\.prettierignore$
88
^\.prettierrc$
99
^\.Rproj\.user$
10+
^\.vscode$
1011
^CITATION\.cff$
1112
^codemeta\.json$
1213
^data-raw$
1314
^doc$
14-
^Dockerfile$
1515
^docker$
16+
^Dockerfile$
1617
^docs$
1718
^figures$
19+
^inst/quarto/report_files$
1820
^LICENSE\.md$
1921
^Meta$
22+
^moo_input\.rds$
2023
^MOSuite\.Rproj$
2124
^pkgdown$
22-
^README\.Rmd$
23-
^README\.html$
24-
^README_files$
25-
^Rplots\.pdf$
26-
^moo_input\.rds$
2725
^plot-volc-enh\.json$
28-
^volc-sum-params\.json$
29-
^report_files$
30-
^inst/quarto/report_files$
26+
^README.*$
27+
^renv\.lock$
28+
^renv$
29+
^report
30+
^Rplots\.pdf$
31+
^SECURITY\.md$
3132
^tests/figures$
33+
^vignettes/cli\.Rmd$
3234
^vignettes/figures/$
3335
^vignettes/memory\.Rmd$
34-
^vignettes/cli\.Rmd$
36+
^volc-sum-params\.json$
3537
VennDiagram.*\.log
36-
^[.]?air[.]toml$
37-
^\.vscode$
38+
^\.posit/assistant$

‎code/MOSuite/.github/package-versions.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎code/MOSuite/.github/requirements.txt‎

Whitespace-only changes.

‎code/MOSuite/.github/workflows/R-CMD-check.yaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
push:
77
branches: [main, master]
88
pull_request:
9-
branches: [main, master]
109
workflow_dispatch:
1110

1211
concurrency:
@@ -23,22 +22,24 @@ jobs:
2322
fail-fast: false
2423
matrix:
2524
config:
26-
- { os: ubuntu-latest, r: 'release' }
27-
- { os: ubuntu-latest, r: 'oldrel-1' }
25+
- { os: ubuntu-latest, r: "release" }
26+
- { os: ubuntu-latest, r: "oldrel-1" }
2827
runs-on: ${{ matrix.config.os }}
2928
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
3029
env:
3130
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3231
R_KEEP_PKG_SOURCE: yes
3332
steps:
3433
- uses: actions/checkout@v6
35-
- uses: CCBR/actions/install-r-pak@main
34+
- uses: r-lib/actions/setup-r@v2
3635
with:
37-
versions-file: .github/package-versions.txt
38-
extra-packages: local::.
39-
needs: dev
4036
r-version: ${{ matrix.config.r }}
4137
http-user-agent: ${{ matrix.config.http-user-agent }}
38+
use-public-rspm: true
39+
- uses: r-lib/actions/setup-r-dependencies@v2
40+
with:
41+
extra-packages: local::.
42+
needs: dev
4243
- uses: r-lib/actions/check-r-package@v2
4344
with:
4445
upload-snapshots: true
@@ -47,10 +48,12 @@ jobs:
4748
runs-on: ubuntu-latest
4849
steps:
4950
- uses: actions/checkout@v6
50-
- uses: CCBR/actions/install-r-pak@main
51+
- uses: r-lib/actions/setup-r@v2
52+
with:
53+
r-version: "4.5"
54+
use-public-rspm: true
55+
- uses: r-lib/actions/setup-r-dependencies@v2
5156
with:
52-
r-version: 4.5
53-
versions-file: .github/package-versions.txt
5457
needs: dev
5558
- name: Lint
5659
shell: Rscript {0}

‎code/MOSuite/.github/workflows/auto-format.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: auto-format
33
on:
44
workflow_dispatch:
55
pull_request:
6-
branches: [ main, master ]
76

87
permissions:
98
contents: write
@@ -38,10 +37,13 @@ jobs:
3837
git config --global user.name "CCBR-bot"
3938
git config --global user.email "258092125+ccbr-bot@users.noreply.github.com"
4039
41-
- uses: CCBR/actions/install-r-pak@main
40+
- uses: r-lib/actions/setup-r@v2
41+
with:
42+
r-version: "4.5"
43+
use-public-rspm: true
44+
45+
- uses: r-lib/actions/setup-r-dependencies@v2
4246
with:
43-
r-version: 4.5
44-
versions-file: .github/package-versions.txt
4547
extra-packages: local::.
4648
needs: dev
4749

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: draft-release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version-tag:
7+
description: |
8+
Semantic version tag for next release.
9+
If not provided, it will be determined based on conventional commit history.
10+
Example: v2.5.11
11+
required: false
12+
type: string
13+
default: ""
14+
15+
permissions:
16+
contents: write
17+
pull-requests: write
18+
actions: write
19+
20+
jobs:
21+
draft-release:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v6
25+
with:
26+
fetch-depth: 0 # required to include tags
27+
- uses: CCBR/actions/draft-release@latest
28+
with:
29+
github-token: ${{ github.token }}
30+
version-tag: ${{ github.event.inputs.version-tag }}
31+
ccbr-actions-version: latest

‎code/MOSuite/.github/workflows/pkgdown.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v6
2929

30-
- uses: CCBR/actions/install-r-pak@main
30+
- uses: r-lib/actions/setup-r@v2
31+
with:
32+
r-version: '4.5'
33+
use-public-rspm: true
34+
35+
- uses: r-lib/actions/setup-r-dependencies@v2
3136
with:
32-
r-version: 4.5
33-
versions-file: .github/package-versions.txt
3437
extra-packages: local::.
3538
needs: dev
3639

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: post-release
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
actions: write
12+
13+
jobs:
14+
cleanup:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v6
18+
with:
19+
fetch-depth: 0
20+
- uses: CCBR/actions/post-release@latest
21+
with:
22+
github-token: ${{ github.token }}
23+
update-sliding-tags: false
24+
ccbr-actions-version: latest
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: syncweaver-source-dispatch
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
source_ref:
9+
description: Optional source ref to dispatch (defaults to release tag for release events, or current ref for manual runs).
10+
required: false
11+
type: string
12+
source_repo:
13+
description: Optional source repository override in OWNER/REPO format (defaults to current repository).
14+
required: false
15+
type: string
16+
orchestrator-repo:
17+
description: Optional orchestrator repository override in OWNER/REPO format.
18+
required: false
19+
default: NIDAP-Community/syncweaver-orchestrator
20+
type: string
21+
22+
permissions:
23+
contents: read
24+
25+
jobs:
26+
notify-syncweaver:
27+
runs-on: ubuntu-latest
28+
env:
29+
SOURCE_REPOSITORY: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.source_repo || github.repository }}
30+
SOURCE_REF: ${{ github.event_name == 'release' && github.event.release.tag_name || github.event.inputs.source_ref || github.ref_name }}
31+
ORCHESTRATOR_REPO: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs['orchestrator-repo'] || vars['orchestrator-repo'] || 'NIDAP-Community/syncweaver-orchestrator' }}
32+
steps:
33+
- name: Validate dispatch payload
34+
shell: bash
35+
run: |
36+
set -euo pipefail
37+
if [[ -z "${SOURCE_REPOSITORY//[[:space:]]/}" ]]; then
38+
echo "Error: source repository cannot be empty." >&2
39+
exit 1
40+
fi
41+
if [[ -z "${SOURCE_REF//[[:space:]]/}" ]]; then
42+
echo "Error: source ref cannot be empty." >&2
43+
exit 1
44+
fi
45+
if [[ -z "${ORCHESTRATOR_REPO//[[:space:]]/}" ]]; then
46+
echo "Error: orchestrator repository cannot be empty." >&2
47+
exit 1
48+
fi
49+
if [[ "${ORCHESTRATOR_REPO}" != */* ]]; then
50+
echo "Error: orchestrator repository must be in OWNER/REPO format." >&2
51+
exit 1
52+
fi
53+
if [[ -z "${{ vars.CCBR_BOT_APP_ID }}" ]]; then
54+
echo "Error: vars.CCBR_BOT_APP_ID is required to generate a dispatch token." >&2
55+
exit 1
56+
fi
57+
if [[ -z "${{ secrets.CCBR_BOT_PRIVATE_KEY }}" ]]; then
58+
echo "Error: secrets.CCBR_BOT_PRIVATE_KEY is required to generate a dispatch token." >&2
59+
exit 1
60+
fi
61+
62+
- name: Resolve orchestrator repository owner and name
63+
id: orchestrator_repo
64+
shell: bash
65+
run: |
66+
set -euo pipefail
67+
owner="${ORCHESTRATOR_REPO%%/*}"
68+
repo="${ORCHESTRATOR_REPO#*/}"
69+
if [[ -z "${owner}" || -z "${repo}" ]]; then
70+
echo "Error: failed to parse orchestrator repository '${ORCHESTRATOR_REPO}'." >&2
71+
exit 1
72+
fi
73+
echo "owner=${owner}" >> "$GITHUB_OUTPUT"
74+
echo "repository=${repo}" >> "$GITHUB_OUTPUT"
75+
76+
- name: Generate CCBR-bot token
77+
id: ccbr_bot
78+
uses: actions/create-github-app-token@v3
79+
with:
80+
client-id: ${{ vars.CCBR_BOT_APP_ID }}
81+
private-key: ${{ secrets.CCBR_BOT_PRIVATE_KEY }}
82+
owner: ${{ steps.orchestrator_repo.outputs.owner }}
83+
repositories: ${{ steps.orchestrator_repo.outputs.repository }}
84+
85+
- name: Dispatch syncweaver-update-hosts workflow in orchestrator repo
86+
uses: peter-evans/repository-dispatch@v4
87+
with:
88+
token: ${{ steps.ccbr_bot.outputs.token }}
89+
repository: ${{ env.ORCHESTRATOR_REPO }}
90+
event-type: syncweaver-update-hosts
91+
client-payload: >-
92+
{"source_repository": ${{ toJson(env.SOURCE_REPOSITORY) }}, "ref": ${{ toJson(env.SOURCE_REF) }}}

0 commit comments

Comments
 (0)