From f50290ba40e80679ab57bf5dcf1c64f11bd033de Mon Sep 17 00:00:00 2001
From: Jared Knowles <jknowles@gmail.com>
Date: Sun, 16 Oct 2022 19:15:33 -0400
Subject: [PATCH] nest stages

---
 Jenkinsfile | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1c4c79a..8de6b2b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     dockerfile true
   }
     stages {
-      stage('Test') {
+      stage('Docker setup') {
         steps {
          sh '''
           R --version
@@ -12,34 +12,33 @@ pipeline {
         }
 
       }
-      stage('Build') {
-        steps {
-          sh '''
-          R CMD build .
-          '''
-        }
-      }
-      stage('Check') {
-        steps {
-          sh '''
-          R CMD check --no-manual civilytics_0.1.0.tar.gz
-          '''
-
-          sh '''
-          R CMD INSTALL civilytics_0.1.0.tar.gz
-          '''
+      stage('Build and test') {
+        stages {
+          stage("Build package") {
+           steps {
+                sh '''
+                R CMD build .
+                '''
+            }
+          }
+        stage('Check') {
+          steps {
+            sh '''
+            R CMD check --no-manual civilytics_0.1.0.tar.gz
+            '''
 
+            sh '''
+            R CMD INSTALL civilytics_0.1.0.tar.gz
+            '''
+          }
         }
-      }
-      stage('testthat'){
+        stage('testthat'){
          steps {
-         sh ```
+         sh '''
          R -e 'testthat::test_local(".")'
-         ```
+         '''
          }
       }
-
-
       stage('Clean') {
         steps {
 
@@ -50,3 +49,5 @@ pipeline {
     }
   }
 }
+}
+}