From f4b6f668a15905ce5dd4402fb2037a6c512a55c7 Mon Sep 17 00:00:00 2001
From: Dirk Eddelbuettel <edd@debian.org>
Date: Mon, 20 Jan 2025 15:26:13 -0600
Subject: [PATCH] Simplify r-ci with setup including bootstrap

---
 .github/workflows/ci.yaml | 5 +----
 ChangeLog                 | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a76c070..12f707a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,10 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup
-        uses: eddelbuettel/github-actions/r-ci-setup@master
-
-      - name: Bootstrap
-        run: ./run.sh bootstrap
+        uses: eddelbuettel/github-actions/r-ci@master
 
       - name: Dependencies
         run: ./run.sh install_all
diff --git a/ChangeLog b/ChangeLog
index 3c4c53d..6aef7e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2025-01-20  Dirk Eddelbuettel  <edd@debian.org>
+
+        * .github/workflows/ci.yaml: Simplify to r-ci with included bootstrap
+
 2024-08-30  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Authors@R): Added