Merge pull request #898 from lorenzwalthert/toucstone-action

Use {touchstone} GitHub Action

Author: lorenzwalthert

.github/workflows/touchstone-comment.yaml

@@ -1,9 +1,5 @@
 name: Continuous Benchmarks (Comment)
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 # read-write repo token
 # access to secrets
 on:
@@ -19,38 +15,4 @@ jobs:
       ${{ github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success' }}
     steps:
-      - name: 'Download artifact'
-        uses: actions/[email protected]
-        with:
-          script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: ${{github.event.workflow_run.id }},
-            });
-            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "pr"
-            })[0];
-            var download = await github.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            var fs = require('fs');
-            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
-      - run: unzip pr.zip
-      - name: 'Comment on PR'
-        uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            var fs = require('fs');
-            var issue_number = Number(fs.readFileSync('./NR'));
-            var body = fs.readFileSync('./info.txt').toString();
-            await github.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issue_number,
-              body: body
-            });
+      - uses: lorenzwalthert/touchstone/actions/comment@main

.github/workflows/touchstone-receive.yaml

@@ -1,8 +1,4 @@
 name: Continuous Benchmarks (Receive)
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 on: pull_request
 jobs:
   prepare:
@@ -37,78 +33,9 @@ jobs:
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-           fetch-depth: 0
-      - name: Set up git user
-        run: |
-          git config --local user.name "GitHub Actions"
-          git config --local user.email "[email protected]"
-      - name: Ensure base branch is fetched
-        run: |
-          git checkout -b $GITHUB_HEAD_REF # this is current ref. This is required for naming.
-          git branch $GITHUB_BASE_REF remotes/origin/$GITHUB_BASE_REF
-      - name: Setup R
-        uses: r-lib/actions/setup-r@master
-      - name: Query dependencies
-        run: |
-          install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v1
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-3-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-3-
-      - name: Install system dependencies
-        if: runner.os == 'Linux'
-        env:
-          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
-        run: |
-          Rscript -e "remotes::install_github('r-hub/sysreqs')"
-          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
-          sudo -s eval "$sysreqs"
-          sudo apt-get install libcurl4-openssl-dev libgit2-dev
-      - name: Install dependencies
-        run: |
-          remotes::install_deps(dependencies = TRUE)
-          remotes::install_github("lorenzwalthert/touchstone")
-          remotes::install_cran(c('ggplot2', 'dplyr'))
-          pkg <- basename(getwd())
-          if (pkg %in% rownames(installed.packages())) {
-            remove.packages(pkg)
-            cat('removed package ', pkg, '.', sep = "")
-          }
-        shell: Rscript {0}
-      - name: Checkout benchmarking repo
-        uses: actions/checkout@v2
-        with:
-          repository: ${{ matrix.config.benchmarking_repo }}
-          ref: ${{ matrix.config.benchmarking_ref }}
-          path: ${{ matrix.config.benchmarking_path }}
-      - name: Run benchmarks
-        run: Rscript -e 'touchstone::run_script("touchstone/script.R")'
-      - name: Save PR number
-        run: |
-          echo ${{ github.event.number }} > ./touchstone/pr-comment/NR
-      - uses: actions/upload-artifact@v2
-        with:
-          name: visual-benchmarks
-          path: touchstone/plots/
-      - uses: actions/upload-artifact@v1
-        with:
-          name: results
-          path: touchstone/pr-comment
-      - uses: actions/download-artifact@v1
-        with:
-          name: results
-      - name: comment PR
-        run: cat touchstone/pr-comment/info.txt
-      - uses: actions/upload-artifact@v2
+      - uses: lorenzwalthert/touchstone/actions/receive@main
         with:
-          name: pr
-          path: touchstone/pr-comment/
+          cache-version: 1
+          benchmarking_repo: ${{matrix.config.benchmarking_repo}}
+          benchmarking_ref: ${{matrix.config.benchmarking_ref}}
+          benchmarking_path: ${{matrix.config.benchmarking_path}}

NEWS.md

@@ -56,6 +56,7 @@
 * Enable pre-commit.ci (#843).
 * use pre-commit via GitHub Actions (#872).
 * terminate running jobs on new push to save resources (#888).
+* Use the {touchstone} GitHub Action instead of the literal script (#889).
 
 # styler 1.6.2
 

tests/testthat/test-cache-with-r-cache.R

@@ -48,10 +48,10 @@ test_that("top-level test: Caches top-level expressions efficiently on style_tex
 
   skip_on_cran()
   expect_lt(
-    partially_cached_benchmark["elapsed"] * 2.5,
+    partially_cached_benchmark["elapsed"] * 2.4,
     not_cached_benchmark["elapsed"]
   )
-  expect_lt(full_cached_benchmark["elapsed"] * 50, benchmark["elapsed"])
+  expect_lt(full_cached_benchmark["elapsed"] * 45, benchmark["elapsed"])
 })
 
 

touchstone/config.json

@@ -1,8 +1,9 @@
 {
-  "os": "ubuntu-18.04",
-  "r": "4.0.0",
+  "os": "ubuntu-20.04",
+  "r": "4.1.1",
+  "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2022-01-07+MTo3NDQwNTcyLDI6NDUyNjIxNTs0QzU3NUZBRQ",
   "benchmarking_repo": "lorenzwalthert/here",
   "benchmarking_ref": "bf0167746da7fe4fb156082bad93c9e5cd3386bd",
   "benchmarking_path": "touchstone/sources/here",
-  "rspm": "https://packagemanager.rstudio.com/cran/__linux__/bionic/2021-04-30"
+
 }