Merge pull request #340 from wwarthen/dev

Dev

Author: wwarthen

Diff for: .github/workflows/commit.yml

@@ -13,16 +13,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Make Slugs
-        uses: rlespinasse/[email protected]
-
       - name: Checkout
         uses: actions/[email protected]
 
+      - name: Get Commit Ref
+        run: |
+          COMMIT_REF=$(git rev-parse --short $GITHUB_SHA)
+          echo "COMMIT_REF: $COMMIT_REF"
+          echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV
+
       - name: Build
         run: |
           export TZ='America/Los_Angeles'
-          sudo apt-get install libncurses-dev
           sudo apt-get install srecord
           make dist
           rm -rf .git*
@@ -36,19 +38,22 @@ jobs:
       - name: Upload Artifact
         uses: actions/[email protected]
         with:
-          name: RomWBW-${{env.GITHUB_SHA_SHORT}}-Linux
+          name: RomWBW-${{env.COMMIT_REF}}-Linux
           path: .
 
   buildMacOS:
     runs-on: macOS-latest
 
     steps:
-      - name: Make Slugs
-        uses: rlespinasse/[email protected]
-
       - name: Checkout
         uses: actions/[email protected]
 
+      - name: Get Commit Ref
+        run: |
+          COMMIT_REF=$(git rev-parse --short $GITHUB_SHA)
+          echo "COMMIT_REF: $COMMIT_REF"
+          echo "COMMIT_REF=$COMMIT_REF" >>$GITHUB_ENV
+
       - name: Build
         run: |
           export TZ='America/Los_Angeles'
@@ -65,5 +70,5 @@ jobs:
       - name: Upload Artifact
         uses: actions/[email protected]
         with:
-          name: RomWBW-${{env.GITHUB_SHA_SHORT}}-MacOS
-          path: .
+          name: RomWBW-${{env.COMMIT_REF}}-MacOS
+          path: .

Diff for: .github/workflows/release.yml

@@ -14,15 +14,6 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
 
-      - name: Create Package Label
-        run: |
-          echo GITHUB_REF: "$GITHUB_REF"
-          LABEL=`echo "$GITHUB_REF" | sed "s|^refs/tags/||"`
-          echo "PKGLBL=$LABEL" >> $GITHUB_ENV
-          echo PKGLBL: "$PKGLBL"
-          echo Upload URL: "${{github.event.release.upload_url}}"
-          echo GITHUB_TOKEN: "${{secrets.GITHUB_TOKEN}}"
-         
       - name: Build
         run: |
           export TZ='America/Los_Angeles'
@@ -33,22 +24,37 @@ jobs:
       
       - name: Create Package Archive
         run: |
-            zip -r RomWBW-${{env.PKGLBL}}-Package.zip .
+          zip -r RomWBW-${{github.ref_name}}-Package.zip .
+
+      - name: Set Title
+        run: |
+          echo "Tag: ${{github.ref_name}}"
+          if grep -q "dev" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Development Snapshot"
+          elif grep -q "pre" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Prerelease"
+          elif grep -q "rc" <<< "${{github.ref_name}}"; then
+            TITLE="RomWBW Release Candidate"
+          else
+            TITLE="RomWBW"
+          fi
+          echo "Title: $TITLE"
+          echo "TITLE=$TITLE" >>$GITHUB_ENV
 
       - name: Attach Package Archive
         uses: wwarthen/actions/packages/automatic-releases@built-packages
         with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          repo_token: "${{secrets.GITHUB_TOKEN}}"
           draft: true
           prerelease: true
-          title: "RomWBW Development SnapShot ${{env.PKGLBL}}"
+          title: "${{env.TITLE}} ${{github.ref_name}}"
           files: |
-            RomWBW-${{env.PKGLBL}}-Package.zip
+            RomWBW-${{github.ref_name}}-Package.zip
       
 #      - name: Upload Package Archive
 #        uses: AButler/[email protected]
 #        with:
-#          repo-token: ${{ secrets.GITHUB_TOKEN }}
+#          repo-token: ${{secrets.github_token}}
 #          files: |
 #            RomWBW-${{env.PKGLBL}}-Package.zip
 
@@ -57,7 +63,7 @@ jobs:
 #        uses: docker://antonyurchenko/git-release:latest
 #        env:
 #          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          RELEASE_NAME_PREFIX: "Development SnapShot Release "
+#          RELEASE_NAME_PREFIX: "${{env.TITLE}} "
 #          CHANGELOG_FILE: "none"
 #        with:
 #          args: |

Diff for: Doc/ChangeLog.txt

@@ -1,3 +1,11 @@
+Version 3.2.1
+-------------
+- M?P: Fixed Zeta 2 FDD and CPUSPD config settings
+- WBW: Fixed SURVEY.COM (again)
+- DDW: Updates to DOS/65 binaries in disk images
+- PMS: Updates to VGMPLAY including support for YM2151
+- WBW: Fix for quark delay adjustment being trashed
+
 Version 3.2
 -----------
 - WBW: Version bump for release

Diff for: Doc/RomWBW Applications.pdf

@@ -1,9 +1,9 @@
 
 
 **RomWBW ReadMe** \
-Version 3.2 \
+Version 3.2.1 \
 Wayne Warthen  ([[email protected]](mailto:[email protected])) \
-18 Mar 2023
+07 Apr 2023
 
 # Overview
 
@@ -102,22 +102,22 @@ functionality.
 
 Complete instructions for installation and operation of RomWBW are found
 in the [RomWBW User
-Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20User%20Guide.pdf).
+Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20User%20Guide.pdf).
 
 ## Documentation
 
 Documentation for RomWBW includes:
 
 - [RomWBW User
-  Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20User%20Guide.pdf)
+  Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20User%20Guide.pdf)
 - [RomWBW System
-  Guide](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20System%20Guide.pdf)
+  Guide](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20System%20Guide.pdf)
 - [RomWBW
-  Applications](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Applications.pdf)
+  Applications](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20Applications.pdf)
 - [RomWBW ROM
-  Applications](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20ROM%20Applications.pdf)
+  Applications](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20ROM%20Applications.pdf)
 - [RomWBW
-  Errata](https://github.com/wwarthen/RomWBW/raw/master/Doc/RomWBW%20Errata.pdf)
+  Errata](https://github.com/wwarthen/RomWBW/raw/dev/Doc/RomWBW%20Errata.pdf)
 
 # Acknowledgments
 

Diff for: Doc/RomWBW Disk Catalog.pdf

@@ -1,6 +1,6 @@
 RomWBW ReadMe
 Wayne Warthen ([email protected])
-18 Mar 2023
+07 Apr 2023