Merge pull request #10 from nosqlbench/simplify_import_docs

Simplify Import Docs

Author: dave2wave

.github/workflows/build-site.yml

@@ -7,71 +7,20 @@ on:
 
 jobs:
 
-  import-generated:
-    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
-
-    steps:
-      - name: set git username
-        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
-
-      - name: set git email
-        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
-
-      - run: ls -la
-
-      - name: clone nosqlbench-build-docs
-        env:
-          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-        run: |
-          git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git nosqlbench-build-docs
-          cd nosqlbench-build-docs
-          echo "files listing"
-          find .
-          git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git
-          git remote -v
-
-      - name: 'Import Content'
-        run: |
-          set -x
-          cd nosqlbench-build-docs
-          ./doimport.sh
-
-      - name: "commit imported changes"
-        env:
-          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
-          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
-        run: |
-          set -x
-          pwd
-          cd nosqlbench-build-docs
-          git add site
-          git add -u
-          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-          echo "found $CHANGES to push for doc updates"
-          if (( $CHANGES > 0 ))
-          then
-            git commit -m"docs update for $GITHUB_REF"
-            git push
-          fi
-
-
   build-site:
-    needs: import-generated
     runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/master'
+    if: github.ref == 'refs/heads/master'
     steps:
 
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: 'set CNAME'
         run: |
           echo "builddocs.nosqlbench.io" > site/static/CNAME
 
       - name: 'Build and Deploy Static Site'
-        uses: shalzz/zola-deploy-action@master
+        uses: shalzz/zola-deploy-action@0.19.2
         env:
           BUILD_DIR: ./site
           GITHUB_TOKEN: ${{ secrets.NBDROID_TOKEN }}

.github/workflows/import-docs.yml

@@ -0,0 +1,57 @@
+name: import-generated
+
+#on:
+#  push:
+#    branches:
+#      - main
+
+jobs:
+
+  import-generated:
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/master'
+
+    steps:
+      - name: set git username
+        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+
+      - name: set git email
+        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
+
+      - run: ls -la
+
+      - name: clone nosqlbench-build-docs
+        env:
+          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+        run: |
+          git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git nosqlbench-build-docs
+          cd nosqlbench-build-docs
+          echo "files listing"
+          find .
+          git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-build-docs.git
+          git remote -v
+
+      - name: 'Import Content'
+        run: |
+          set -x
+          cd nosqlbench-build-docs
+          #./doimport.sh
+
+      - name: "commit imported changes"
+        env:
+          NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
+          NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
+        run: |
+          set -x
+          pwd
+          cd nosqlbench-build-docs
+          git add site
+          git add -u
+          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+          echo "found $CHANGES to push for doc updates"
+          if (( $CHANGES > 0 ))
+          then
+            git commit -m"docs update for $GITHUB_REF"
+            git push
+          fi

.gitignore

@@ -110,3 +110,6 @@ dist
 /.idea/
 /bin/zola
 /import/
+
+# macOS Finder
+**/.DS_Store