From aac9dcf36388c12e1ba4cc399e250fb534471698 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Fri, 6 Sep 2024 09:23:37 -0700 Subject: [PATCH 1/4] adding version check for pull requests --- .github/workflows/version-check.yaml | 56 ++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/version-check.yaml diff --git a/.github/workflows/version-check.yaml b/.github/workflows/version-check.yaml new file mode 100644 index 00000000..917aad3f --- /dev/null +++ b/.github/workflows/version-check.yaml @@ -0,0 +1,56 @@ +--- +on: + workflow_call: + +name: Version check + +jobs: + version-check: + if: ${{ github.event_name == 'pull_request' }} + runs-on: ubuntu-latest + env: + GITHUB_PAT: ${{ github.token }} + permissions: + pull-requests: read + + steps: + + - name: checkout working HEAD + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + sparse-checkout: | + DESCRIPTION + path: working + + - name: checkout base HEAD + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.base.ref }} + sparse-checkout: | + DESCRIPTION + path: compare + + - name: show files + run: | + ls -lR working compare + echo "\nWORKING:\n" + cat working/DESCRIPTION + echo "\nCOMPARE:\n" + cat compare/DESCRIPTION + + - name: Setup R + uses: r-lib/actions/setup-r@v2 + with: + use-public-rspm: true + + - name: compare versions + run: | + Rscript -e " \ + install.packages('desc'); \ + working_version <- desc::desc_get_version('working/DESCRIPTION'); \ + message('working version: ', working_version); \ + compare_version <- desc::desc_get_version('compare/DESCRIPTION'); \ + message('compare version: ', compare_version); \ + stopifnot(working_version > compare_version); \ + " From b73a8659942830382e5e95013c551e1acc12d84e Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Fri, 6 Sep 2024 09:28:32 -0700 Subject: [PATCH 2/4] fix run condition --- .github/workflows/version-check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/version-check.yaml b/.github/workflows/version-check.yaml index 917aad3f..5c7ca748 100644 --- a/.github/workflows/version-check.yaml +++ b/.github/workflows/version-check.yaml @@ -1,6 +1,8 @@ --- on: - workflow_call: + pull_request: + branches: + - main name: Version check From f79ea7cfe4b79f073dfcb6feb591cdcfd97184b9 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Fri, 6 Sep 2024 09:30:59 -0700 Subject: [PATCH 3/4] increment dev version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e7072383..beeafc47 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: serocalculator Type: Package Title: Estimating Infection Rates from Serological Data -Version: 1.2.0.9000 +Version: 1.2.0.9001 Authors@R: c( person(given = "Peter", family = "Teunis", email = "p.teunis@emory.edu", role = c("aut", "cph"), comment = "Author of the method and original code."), person(given = "Kristina", family = "Lai", email = "kwlai@ucdavis.edu", role = c("aut", "cre")), From a92fedd7630f1da8b69d0c6b98cf2f9795820f89 Mon Sep 17 00:00:00 2001 From: Douglas Ezra Morrison Date: Fri, 6 Sep 2024 10:24:20 -0700 Subject: [PATCH 4/4] improve messaging --- .github/workflows/version-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/version-check.yaml b/.github/workflows/version-check.yaml index 5c7ca748..76d3603d 100644 --- a/.github/workflows/version-check.yaml +++ b/.github/workflows/version-check.yaml @@ -4,7 +4,7 @@ on: branches: - main -name: Version check +name: Version increment check jobs: version-check: @@ -51,8 +51,8 @@ jobs: Rscript -e " \ install.packages('desc'); \ working_version <- desc::desc_get_version('working/DESCRIPTION'); \ - message('working version: ', working_version); \ + message('PR branch version: ', working_version); \ compare_version <- desc::desc_get_version('compare/DESCRIPTION'); \ - message('compare version: ', compare_version); \ + message('main branch version: ', compare_version); \ stopifnot(working_version > compare_version); \ "