From b07491dba6b74b595cb164662d6ee3d878b9b90b Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 21:19:27 +0200 Subject: [PATCH 1/9] Test: Update GitHub Actions versions --- .github/workflows/Build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index c27bb16..cc831fe 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -32,11 +32,11 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 # This will install Merlin32 on your Github Runner machine - name: install-merlin32-action - uses: digarok/install-merlin32-action@v0.1.1 + uses: digarok/install-merlin32-action@master # Now you can use it to assemble your source code - name: Assembly Step @@ -45,14 +45,14 @@ jobs: # CHK Errors (if the previous step failure, there's errors in the source code, then it will upload the errors text file in artifact) - name: CHK errors if: ${{ failure() }} - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: Error path: ./src/error_output.txt # This will install Cadius on your Github Runner machine - name: Install Cadius - uses: digarok/install-cadius-action@v0.1.1 + uses: digarok/install-cadius-action@master # This will make bootalble ProDOS DISK image - name: Make bootable ProDOS image @@ -68,7 +68,7 @@ jobs: ls -al src # This will upload entire work directory in artifact - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: Output path: ./src/ From 597639144ebaff819bcea00b5302d77ec2c9a423 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 21:23:26 +0200 Subject: [PATCH 2/9] Update test date to trigger workflow --- src/TESTBIN.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TESTBIN.s b/src/TESTBIN.s index c170fe7..f9d291a 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 2 10/4 +* Actions test 5/6/2025 * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From baa76469b00a7ac868d6871518a524e158959cc9 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 21:26:12 +0200 Subject: [PATCH 3/9] Enable workflow on test branch --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index cc831fe..bfd1957 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -11,7 +11,7 @@ name: CI # events but only for the master branch on: push: - branches: [ master ] + branches: [ master, update-github-actions ] paths: - 'src/TESTBAS' - 'src/TESTBIN.s' From 35255069015d236a3af54bfa075812138399099e Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 21:27:37 +0200 Subject: [PATCH 4/9] Trigger workflow test --- src/TESTBIN.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TESTBIN.s b/src/TESTBIN.s index f9d291a..42e2f0f 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 5/6/2025 +* Actions test 5/6/2025 - trigger workflow * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From 48fe11b9667f3882617551652277a0893b9fffcd Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 23:11:00 +0200 Subject: [PATCH 5/9] Test base version workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testing the base workflow version to confirm it builds successfully before adding timestamp fixes. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- src/TESTBIN.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TESTBIN.s b/src/TESTBIN.s index 42e2f0f..227376a 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 5/6/2025 - trigger workflow +* Actions test 5/6/2025 - retest base version * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From 8bd9584b9c36ff8315c53de54132d3d1dd899ba2 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 23:13:54 +0200 Subject: [PATCH 6/9] Add ProDOS file timestamp fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Generate BUILD_DATE and BUILD_TIME variables using date command - Create _FileInformation.txt for each file individually before addfile - Include Created and Modified timestamp fields matching local script logic - Update test comment in TESTBIN.s 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/workflows/Build.yml | 18 ++++++++++++++++-- src/TESTBIN.s | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index bfd1957..8e3149f 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -57,14 +57,28 @@ jobs: # This will make bootalble ProDOS DISK image - name: Make bootable ProDOS image run: | + # Set build timestamp variables + BUILD_DATE=$(date '+%d-%b-%y' | tr '[:lower:]' '[:upper:]') + BUILD_TIME=$(date '+%H:%M') + echo "Build date: $BUILD_DATE $BUILD_TIME" + + # Create ProDOS volume cadius createvolume ./src/virtual.po unidisk 140KB cadius addfile ./src/virtual.po /unidisk/ ./PRODOS.2.4.2/PRODOS cadius addfile ./src/virtual.po /unidisk/ ./PRODOS.2.4.2/BASIC.SYSTEM - echo "TESTBAS=Type(04),AuxType(0000),VersionCreate(24),MinVersion(00),Access(E3)" > ./src/_FileInformation.txt + + # Add TESTBAS with timestamp info + echo "TESTBAS=Type(04),AuxType(0000),VersionCreate(24),MinVersion(00),Access(E3),Created($BUILD_DATE $BUILD_TIME),Modified($BUILD_DATE $BUILD_TIME)" > ./src/_FileInformation.txt cadius addfile ./src/virtual.po /unidisk/ ./src/TESTBAS - echo "TESTBIN=Type(06),AuxType(8000),VersionCreate(24),MinVersion(00),Access(E3)" >> ./src/_FileInformation.txt + + # Add TESTBIN with timestamp info + echo "TESTBIN=Type(06),AuxType(8000),VersionCreate(24),MinVersion(00),Access(E3),Created($BUILD_DATE $BUILD_TIME),Modified($BUILD_DATE $BUILD_TIME)" > ./src/_FileInformation.txt cadius addfile ./src/virtual.po /unidisk/ ./src/TESTBIN + + # Show results cadius catalog ./src/virtual.po + echo "File info created:" + cat ./src/_FileInformation.txt ls -al src # This will upload entire work directory in artifact diff --git a/src/TESTBIN.s b/src/TESTBIN.s index 227376a..39120ce 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 5/6/2025 - retest base version +* Actions test 5/6/2025 - add timestamp fix * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From 6db2a533dbb268d43e490903b1cba78a349dd37e Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 23:18:10 +0200 Subject: [PATCH 7/9] Fix ProDOS timestamp format to match working local script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use VersionCreate(00) instead of (24) - Use AuxType(2000) for TESTBIN to match local script - Combine timestamp into single variable for consistency - Update test comment 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/workflows/Build.yml | 9 +++++---- src/TESTBIN.s | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 8e3149f..6ec043e 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -57,10 +57,11 @@ jobs: # This will make bootalble ProDOS DISK image - name: Make bootable ProDOS image run: | - # Set build timestamp variables + # Set build timestamp variables (ProDOS format) BUILD_DATE=$(date '+%d-%b-%y' | tr '[:lower:]' '[:upper:]') BUILD_TIME=$(date '+%H:%M') - echo "Build date: $BUILD_DATE $BUILD_TIME" + TIMESTAMP="$BUILD_DATE $BUILD_TIME" + echo "Build timestamp: $TIMESTAMP" # Create ProDOS volume cadius createvolume ./src/virtual.po unidisk 140KB @@ -68,11 +69,11 @@ jobs: cadius addfile ./src/virtual.po /unidisk/ ./PRODOS.2.4.2/BASIC.SYSTEM # Add TESTBAS with timestamp info - echo "TESTBAS=Type(04),AuxType(0000),VersionCreate(24),MinVersion(00),Access(E3),Created($BUILD_DATE $BUILD_TIME),Modified($BUILD_DATE $BUILD_TIME)" > ./src/_FileInformation.txt + echo "TESTBAS=Type(04),AuxType(0000),VersionCreate(00),MinVersion(00),Access(E3),Created($TIMESTAMP),Modified($TIMESTAMP)" > ./src/_FileInformation.txt cadius addfile ./src/virtual.po /unidisk/ ./src/TESTBAS # Add TESTBIN with timestamp info - echo "TESTBIN=Type(06),AuxType(8000),VersionCreate(24),MinVersion(00),Access(E3),Created($BUILD_DATE $BUILD_TIME),Modified($BUILD_DATE $BUILD_TIME)" > ./src/_FileInformation.txt + echo "TESTBIN=Type(06),AuxType(2000),VersionCreate(00),MinVersion(00),Access(E3),Created($TIMESTAMP),Modified($TIMESTAMP)" > ./src/_FileInformation.txt cadius addfile ./src/virtual.po /unidisk/ ./src/TESTBIN # Show results diff --git a/src/TESTBIN.s b/src/TESTBIN.s index 39120ce..610fda4 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 5/6/2025 - add timestamp fix +* Actions test 5/6/2025 - fix timestamp format * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From 7ad405b5c3acef8560b9699bbe5d71c76ebb7020 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 23:32:02 +0200 Subject: [PATCH 8/9] Add Cadius version check to debug timestamp issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add step to display Cadius version for troubleshooting - Update test date to trigger workflow - Investigate "nodate" issue in ProDOS disk images 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/workflows/Build.yml | 4 ++++ src/TESTBIN.s | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 6ec043e..718ac46 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -54,6 +54,10 @@ jobs: - name: Install Cadius uses: digarok/install-cadius-action@master + # Check Cadius version for debugging + - name: Check Cadius version + run: cadius --version || cadius || echo "Cadius installed" + # This will make bootalble ProDOS DISK image - name: Make bootable ProDOS image run: | diff --git a/src/TESTBIN.s b/src/TESTBIN.s index 610fda4..08dcad2 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 5/6/2025 - fix timestamp format +* Actions test 6/6/2025 - cadius version check * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform From d9a910b08ef036cd1887622c743bb7228425b90f Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 5 Jun 2025 23:57:51 +0200 Subject: [PATCH 9/9] Test Cadius action v0.1.2 for timestamp support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update both Merlin32 and Cadius actions to v0.1.2 - Follow digarok's official example configuration - Test if newer action version includes updated Cadius with timestamp support 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .github/workflows/Build.yml | 4 ++-- src/TESTBIN.s | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 718ac46..edc9133 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -36,7 +36,7 @@ jobs: # This will install Merlin32 on your Github Runner machine - name: install-merlin32-action - uses: digarok/install-merlin32-action@master + uses: digarok/install-merlin32-action@v0.1.2 # Now you can use it to assemble your source code - name: Assembly Step @@ -52,7 +52,7 @@ jobs: # This will install Cadius on your Github Runner machine - name: Install Cadius - uses: digarok/install-cadius-action@master + uses: digarok/install-cadius-action@v0.1.2 # Check Cadius version for debugging - name: Check Cadius version diff --git a/src/TESTBIN.s b/src/TESTBIN.s index 08dcad2..00070dc 100644 --- a/src/TESTBIN.s +++ b/src/TESTBIN.s @@ -1,4 +1,4 @@ -* Actions test 6/6/2025 - cadius version check +* Actions test 6/6/2025 - test cadius v0.1.2 * Unidisk 3.5 Calc * * The target of this project is to use the Unidisk 3.5 drive to perform