Patch 0.8.1 (#14)

* Adding 0x60 variant for CASDUMP * Fixing dependency
ifilot · Aug 2, 2024 · df893c3 · df893c3
1 parent 7bfaf13
commit df893c3
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -708,7 +708,7 @@ jobs:
 
 #-------------------------------------------------------------------------------
 
-  build-prg-casdump:
+  build-prg-casdump-0x40:
     runs-on: ubuntu-latest
     container: 
       image: z88dk/z88dk
@@ -720,16 +720,37 @@ jobs:
         cd programs/casdump
         sed -i 's/node[[:digit:]]\+/node2000000/g' Makefile
         make cassettedump-prg
-        ls -alh
+        mv -v CASDUMP.PRG CASDUMP-0x40.PRG
+    - name: Upload CASDUMP.BIN
+      uses: actions/upload-artifact@v4
+      with:
+        name: CASDUMP-UNSIGNED-0x40.PRG
+        path: programs/casdump/CASDUMP-0x40.PRG
+
+  build-prg-casdump-0x60:
+    runs-on: ubuntu-latest
+    container: 
+      image: z88dk/z88dk
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build CRC16 PRG
+      run: |
+        cd programs/casdump
+        sed -i "s/0x40/0x60/" ports.h
+        sed -i "s/\$40/\$60/" ports.inc
+        sed -i 's/node[[:digit:]]\+/node2000000/g' Makefile
+        make cassettedump-prg
+        mv -v CASDUMP.PRG CASDUMP-0x60.PRG
     - name: Upload CASDUMP.BIN
       uses: actions/upload-artifact@v4
       with:
-        name: CASDUMP-UNSIGNED.PRG
-        path: programs/casdump/CASDUMP.PRG
+        name: CASDUMP-UNSIGNED-0x60.PRG
+        path: programs/casdump/CASDUMP-0x60.PRG
 
-  sign-prg-casdump:
+  sign-prg-casdump-0x40:
     runs-on: ubuntu-latest
-    needs: [build-prg-casdump]
+    needs: [build-prg-casdump-0x40]
     permissions: write-all
     steps:
     - uses: actions/checkout@v3
@@ -738,16 +759,38 @@ jobs:
     - name: Download artifact
       uses: actions/download-artifact@v4
       with:
-        name: CASDUMP-UNSIGNED.PRG
+        name: CASDUMP-UNSIGNED-0x40.PRG
         path: ./
     - name: Sign binary
       run: |
-        python3 scripts/signprg.py CASDUMP.PRG
+        python3 scripts/signprg.py CASDUMP-0x40.PRG
     - name: Upload CASDUMP.PRG
       uses: actions/upload-artifact@v4
       with:
-        name: CASDUMP.PRG
-        path: CASDUMP.PRG
+        name: CASDUMP-0x40.PRG
+        path: CASDUMP-0x40.PRG
+
+  sign-prg-casdump-0x60:
+    runs-on: ubuntu-latest
+    needs: [build-prg-casdump-0x60]
+    permissions: write-all
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install dependencies
+      run: sudo apt install -y python3
+    - name: Download artifact
+      uses: actions/download-artifact@v4
+      with:
+        name: CASDUMP-UNSIGNED-0x60.PRG
+        path: ./
+    - name: Sign binary
+      run: |
+        python3 scripts/signprg.py CASDUMP-0x60.PRG
+    - name: Upload CASDUMP.PRG
+      uses: actions/upload-artifact@v4
+      with:
+        name: CASDUMP-0x60.PRG
+        path: CASDUMP-0x60.PRG
 
 #-------------------------------------------------------------------------------
 
@@ -797,16 +840,38 @@ jobs:
         asset_name: PROGRAMS.zip
         asset_content_type: application/octet-stream
 
-  deploy-casdump:
+  deploy-casdump-0x40:
+    runs-on: ubuntu-latest
+    needs: [sign-prg-casdump-0x40, create-release]
+    permissions: write-all
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+    - name: Download CASDUMP.PRG
+      uses: actions/download-artifact@v4
+      with:
+        name: CASDUMP-0x40.PRG
+        path: ./
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create-release.outputs.upload_url }}
+        asset_path: CASDUMP-0x40.PRG
+        asset_name: CASDUMP-0x40.PRG
+        asset_content_type: application/octet-stream
+
+  deploy-casdump-0x60:
     runs-on: ubuntu-latest
-    needs: [sign-prg-casdump, create-release]
+    needs: [sign-prg-casdump-0x60, create-release]
     permissions: write-all
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
     - name: Download CASDUMP.PRG
       uses: actions/download-artifact@v4
       with:
-        name: CASDUMP.PRG
+        name: CASDUMP-0x60.PRG
         path: ./
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -815,6 +880,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ needs.create-release.outputs.upload_url }}
-        asset_path: CASDUMP.PRG
-        asset_name: CASDUMP.PRG
+        asset_path: CASDUMP-0x60.PRG
+        asset_name: CASDUMP-0x60.PRG
         asset_content_type: application/octet-stream
diff --git a/README.md b/README.md
@@ -56,10 +56,10 @@ download file does.
 * [BASICBOOTSTRAP-0x40.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/BASICBOOTSTRAP-0x40.BIN)
 * [FLASHER-0x40.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/FLASHER-0x40.BIN)
 * [LAUNCHER-0x40.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/LAUNCHER-0x40.BIN)
+* [CASDUMP-0x40.PRG](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/CASDUMP-0x40.PRG)
 * [PROGRAMS.ZIP](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/PROGRAMS.ZIP)
 * [MULTIROM-4x16k-0x40.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/MULTIROM-4x16k-0x40.BIN) (W27C512 / 64 KiB)
 * [MULTIROM-32x16k-0x40.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/MULTIROM-32x16k-0x40.BIN) (SST39SF040 / 512 KiB)
-* [CASDUMP.PRG](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/CASDUMP.PRG) (only works for 0x40 version)
 
 ### 0x60 version
 
@@ -72,6 +72,7 @@ download file does.
 * [BASICBOOTSTRAP-0x60.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/BASICBOOTSTRAP-0x60.BIN)
 * [FLASHER-0x60.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/FLASHER-0x60.BIN)
 * [LAUNCHER-0x60.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/LAUNCHER-0x60.BIN)
+* [CASDUMP-0x60.PRG](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/CASDUMP-0x60.PRG)
 * [PROGRAMS.ZIP](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/PROGRAMS.ZIP)
 * [MULTIROM-4x16k-0x60.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/MULTIROM-4x16k-0x60.BIN) (W27C512 / 64 KiB)
 * [MULTIROM-32x16k-0x60.BIN](https://github.com/ifilot/p2000t-sdcard/releases/latest/download/MULTIROM-32x16k-0x60.BIN) (SST39SF040 / 512 KiB)

diff --git a/programs/casdump/config.h b/programs/casdump/config.h
@@ -21,6 +21,6 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define __VERSION__ "0.8.0"
+#define __VERSION__ "0.8.1"
 
 #endif
diff --git a/src/config.h b/src/config.h
@@ -21,6 +21,6 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define __VERSION__ "0.8.0"
+#define __VERSION__ "0.8.1"
 
 #endif