From ac9b94f42cb4518b495e74dacbaa589d4cceb66e Mon Sep 17 00:00:00 2001
From: Altan Orhon <altan@uw.edu>
Date: Tue, 24 Oct 2023 18:36:03 -0700
Subject: [PATCH] Simplified workflows

---
 .github/workflows/mkinstaller.yml |  7 +++++-
 .github/workflows/mkreadme.yml    | 42 ++++++++++---------------------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/mkinstaller.yml b/.github/workflows/mkinstaller.yml
index 5e880f1..e4e8a3e 100644
--- a/.github/workflows/mkinstaller.yml
+++ b/.github/workflows/mkinstaller.yml
@@ -8,7 +8,12 @@ jobs:
     name: Build install.sh
     permissions: write-all
     steps:
-      - name: Template, create, and push install.sh
+      - name: Check out code for the container build
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Update install.sh if needed
+        id: update-installer
         run: |
           if ! git --no-pager diff --name-only --quiet --diff-filter=AM ${{ github.event.before }} ${{ github.event.after }} -- .build/install.j2.sh .github/workflows/mkinstaller.yml; then
             python3 -m pip install jinja-cli
diff --git a/.github/workflows/mkreadme.yml b/.github/workflows/mkreadme.yml
index 7d98a26..392a89d 100644
--- a/.github/workflows/mkreadme.yml
+++ b/.github/workflows/mkreadme.yml
@@ -8,39 +8,23 @@ jobs:
     name: Build README.md
     permissions: write-all
     steps:
-      - name: Install jinja-cli
-        run: |
-          python3 -m pip install jinja-cli
       - name: Check out code for the container build
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check if README.md has changed
-        id: readme-changed
+      - name: Update README.md if needed
+        id: update-readme
         run: |
           if git --no-pager diff --name-only --quiet --diff-filter=AM ${{ github.event.before }} ${{ github.event.after }} -- hyakvnc .build/README.j2.md .github/workflows/mkreadme.yml; then
-            gh run cancel ${{ github.run_id }}
-            gh run watch ${{ github.run_id }}
+            pushd .build/
+            sed -E '/^HYAKVNC_.*#\s*%%/!d; s/=.*(#\s*%%)/:/g; s/(^.)/- \1/g' ../hyakvnc > config.inc.md
+            for x in create status show stop config install; do ../hyakvnc help "$x" | sed -E '1 s/(.*)/\n### \1\n/; 2 s/^$/```text/' | pr -e4 -t && echo '```'; done > usage.inc.md
+            jinja -D github_repository "${{ github.repository }}" -D github_ref_name "${{ github.ref_name }}" README.j2.md | sed 's/^.*<!-- markdownlint-disable-file -->.*$//g' > ../README.md
+            popd
+            git config --local user.email "${{ github.event.sender.id }}+${{ github.event.sender.login }}@users.noreply.github.com"
+            git config --local user.name ${{ github.event.sender.login }}
+            git add README.md
+            git commit -am "Update README.md"
+            git push
           fi
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Generate configuration descriptions
-        run: |
-          pushd .build/
-          sed -E '/^HYAKVNC_.*#\s*%%/!d; s/=.*(#\s*%%)/:/g; s/(^.)/- \1/g' ../hyakvnc > config.inc.md
-          popd
-      - name: Generate usage descriptions
-        run: |
-          pushd .build/
-          for x in create status show stop config install; do ../hyakvnc help "$x" | sed -E '1 s/(.*)/\n### \1\n/; 2 s/^$/```text/' | pr -e4 -t && echo '```'; done > usage.inc.md
-          popd
-      - name: Create and push README.md
-        run: |
-          pushd .build/
-          jinja -D github_repository "${{ github.repository }}" -D github_ref_name "${{ github.ref_name }}" README.j2.md | sed 's/^.*<!-- markdownlint-disable-file -->.*$//g' > ../README.md
-          popd
-          git config --local user.email "${{ github.event.sender.id }}+${{ github.event.sender.login }}@users.noreply.github.com"
-          git config --local user.name ${{ github.event.sender.login }}
-          git add README.md
-          git commit -am "Update README.md"
-          git push
+