Staging -> Main

.github/sync.yml

@@ -3,20 +3,22 @@
 
 group:
   - files:
-      - source: .github/workflows/render-bookdown.yml
-        dest: .github/workflows/render-bookdown.yml
-      - source: .github/workflows/render-preview.yml
-        dest: .github/workflows/render-preview.yml
-      - source: .github/workflows/render-leanpub.yml
-        dest: .github/workflows/render-leanpub.yml
-      - source: .github/workflows/docker-build-test.yml
-        dest: .github/workflows/docker-build-test.yml
+      - source: config_automation.yml
+        dest: config_automation.yml
+      - source: .github/workflows/
+        dest: .github/workflows/
+        deleteOrphaned: true
+      - source: scripts/
+        dest: scripts/
+        deleteOrphaned: true
+      - source: .github/workflows/pull-request.yml
+        dest: .github/workflows/pull-request.yml
+      - source: .github/workflows/render-all.yml
+        dest: .github/workflows/render-all.yml
+      - source: .github/workflows/docker-build.yml
+        dest: .github/workflows/docker-build.yml
       - source: .github/workflows/transfer-rendered-files.yml
         dest: .github/workflows/transfer-rendered-files.yml
-      - source: .github/workflows/style-and-sp-check.yml
-        dest: .github/workflows/style-and-sp-check.yml
-      - source: .github/workflows/url-checker.yml
-        dest: .github/workflows/url-checker.yml
       - source: .github/workflows/release-notes.yml
         dest: .github/workflows/release-notes.yml
       - source: .github/workflows/delete-preview.yml
@@ -29,8 +31,6 @@ group:
         dest: scripts/make_screenshots.R
       - source: scripts/spell-check.R
         dest: scripts/spell-check.R
-      - source: scripts/get_spell_errors.R
-        dest: scripts/get_spell_errors.R
       - source: scripts/git_repo_check.R
         dest: scripts/git_repo_check.R
       - source: code_of_conduct.md
@@ -62,10 +62,8 @@ group:
 
 ### This is a custom group for this repo which doesn't want syncing on all the files ###
   - files:
-    - source: .github/workflows/style-and-sp-check.yml
-      dest: .github/workflows/style-and-sp-check.yml
-    - source: .github/workflows/url-checker.yml
-      dest: .github/workflows/url-checker.yml
+    - source: .github/workflows/pull-request.yml
+      dest: .github/workflows/pull-request.yml
     - source: scripts/spell-check.R
       dest: scripts/spell-check.R
     repos: |

.github/workflows/delete-preview.yml

@@ -2,11 +2,9 @@
 
 name: Delete Preview
 
-#---TRIGGER-START---#
 on:
   pull_request:
     types: [closed]
-#---TRIGGER-END---#
 
 jobs:
   delete-preview:
@@ -19,8 +17,7 @@ jobs:
         shell: bash
 
       # Delete the branch!
-      - name: Delete branch
-        uses: dawidd6/action-delete-branch@v3
-        with:
-          github_token: ${{ secrets.GH_PAT }}
-          branches: preview-${{ github.event.pull_request.number }}
+      - name: Delete branch locally and remotely
+        run: |
+          git branch -d preview-${{ github.event.pull_request.number }} || echo "No branch to delete"
+          git push origin --delete preview-${{ github.event.pull_request.number }} || echo "No branch to delete"

.github/workflows/docker-build-test.yml → .github/workflows/docker-build.yml

@@ -1,26 +1,18 @@
 # Candace Savonen Apr 2021
 
-name: Build of Docker
+name: Build Docker
 
-
-#---TRIGGER-START---#
 on:
-  release:
-    types:
-      - created
-  pull_request:
-    branches: [ main, staging ]
-    paths: [ docker/Dockerfile, docker/github_package_list.tsv ]
   workflow_dispatch:
     inputs:
       dockerhubpush:
         description: 'Push to Dockerhub?'
         required: true
         default: 'false'
-#---TRIGGER-END----#
 
 jobs:
   build-docker:
+    name: Build Docker image
     runs-on: ubuntu-latest
 
     steps:
@@ -33,18 +25,15 @@ jobs:
           git config --local user.name "jhudsl-robot"
 
       - name: Don't re-test if this is a sync branch
-        if: ${{ github.head_ref == 'repo-sync/OTTR_Template/default' }}
         run: |
           echo This was tested on OTTR_Template no need to re-run
 
       # Set up Docker build
       - name: Set up Docker Buildx
-        if: ${{ github.head_ref != 'repo-sync/OTTR_Template/default' }}
         uses: docker/setup-buildx-action@v1
 
       # Setup layer cache
       - name: Cache Docker layers
-        if: ${{ github.head_ref != 'repo-sync/OTTR_Template/default' }}
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
@@ -58,12 +47,10 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Get token
-        if: ${{ github.head_ref != 'repo-sync/OTTR_Template/default' }}
         run: echo ${{ secrets.GH_PAT }} > docker/git_token.txt
 
       # Build docker image
       - name: Build Docker image
-        if: ${{ github.head_ref != 'repo-sync/OTTR_Template/default' }}
         uses: docker/build-push-action@v2
         with:
           push: false
@@ -86,14 +73,6 @@ jobs:
         run: docker push jhudsl/course_template
 
       - name: Get the version
-        if: ${{ github.head_ref != 'repo-sync/OTTR_Template/default' }}
         id: get_version
         run: |
           echo ::set-output name=version::$(echo $GITHUB_REF | cut -d / -f 3)
-
-      # Push the Docker image if it is a release
-      - name: Push Docker image if release
-        if: ${{ github.event_name == 'release' }}
-        run: |
-          docker tag jhudsl/course_template:latest jhudsl/course_template:${{ steps.get_version.outputs.version }}
-          docker push jhudsl/course_template:${{ steps.get_version.outputs.version }}