Merge pull request #57 from NIEHS/staging

Staging

.github/workflows/protect-main.yml

@@ -25,8 +25,8 @@ jobs:
           continue="${{ steps.check-base-branch.outputs.continue }}"
           if [[ "$continue" == "true" ]]; then
             source_branch=$(jq -r '.pull_request.head.ref' "$GITHUB_EVENT_PATH")
-            if [[ "$source_branch" != "staging-public" ]]; then
-              echo "Pull requests into \"main\" must come from \"staging-public\"."
+            if [[ "$source_branch" != "staging" ]]; then
+              echo "Pull requests into \"main\" must come from \"staging\"."
               exit 1
             fi
           else

.github/workflows/update-staging-external.yml

@@ -4,7 +4,7 @@ name: Update external repository `PCOR_bookdown_staging`
 
 on:
   push:
-    branches: [staging-internal]
+    branches: [staging]
 
 jobs:
   sync:
@@ -14,7 +14,7 @@ jobs:
       - name: Checkout `PCOR_public` repository
         uses: actions/checkout@v3
         with:
-          ref: staging-internal
+          ref: staging
 
       - name: Set up Git
         run: |
@@ -42,7 +42,7 @@ jobs:
           cd PCOR_bookdown_staging
           git add .
           git status
-          git commit -m "Sync PCOR_public staging-internal branch" || echo "No changes to commit"
+          git commit -m "Sync PCOR_public staging branch" || echo "No changes to commit"
           git push https://${{ secrets.PCOR_bookdown_staging_actions_06262024 }}@github.com/NIEHS/PCOR_bookdown_staging.git main
 
     env:

README.md

@@ -51,7 +51,7 @@ bookdown::render_book("chapters/index.Rmd", "bookdown::gitbook")
 
 The following workflow rules and branch protections facilitate development, revision, review, and publication of the CHORDS Toolkit.
 
-<img align="center" src="images/workflow_push.png">
+<img align="center" src="images/workflow_staging_2.png">
 
 #### Development Branches