diff --git a/.github/workflows/assemble_and_publish_release.yml b/.github/workflows/assemble_and_publish_release.yml index 8148642..7baf699 100644 --- a/.github/workflows/assemble_and_publish_release.yml +++ b/.github/workflows/assemble_and_publish_release.yml @@ -1,21 +1,47 @@ -name: goreleaser +name: GSLib CI (Appy Project - 65xxx Assemble+Package) on: pull_request: push: jobs: - goreleaser: + appy-ci: runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v3 with: fetch-depth: 0 # This will install Appy plus Merlin32 and Cadius on your Github Runner machine - name: Install Appy - uses: digarok/install-appy-pack-action@master + uses: digarok/install-appy-pack-action@main with: include_prodos: true - appyVersion: v0.1.6 \ No newline at end of file + # appy_version: v0.1.7 + # Now you can use it to assemble your project(s) + - name: Assemble + run: | + appy asm + # This could be one step but I like to see the disk image separately in github UI + - name: Create Disk Image + run: | + appy disk + - name: Create Release + id: create_release + if: startsWith(github.ref, 'refs/tags/v') + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + - name: Upload Release Asset - 800KB ProDOS Image + if: startsWith(github.ref, 'refs/tags/v') + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./demodisk800.2mg + asset_name: demodisk800.2mg + asset_content_type: application/octet-stream diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a3aca8e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*_Output.txt +*.Sys16 +*.Sys16 +*.system \ No newline at end of file diff --git a/appy.yaml b/appy.yaml new file mode 100644 index 0000000..b1343cd --- /dev/null +++ b/appy.yaml @@ -0,0 +1,40 @@ +assemble: +- source/quit.s +- source/quit8.s +- source/quit16.s +- source/shr1.s +- source/shr2.s +- source/shrhello.s +- source/shrloadimg.s +assembleflags: "-V" +# formatflags: "mc:10 oc:14 cc:30 ms:1 bs:2" +indent: +- source/quit.s +- source/quit8.s +- source/quit16.s +- source/shr1.s +- source/shr2.s +- source/shrhello.s +- source/shrloadimg.s +disks: +- name: demodisk + file: demodisk800.2mg + size: 800KB + files: + # - input: ../PRODOS.2.4.2/PRODOS + # output: /mydiskimage + - input: source/quit + output: /demodisk + - input: source/quit8.system + output: /demodisk + - input: source/Quit.Sys16 + output: /demodisk + - input: source/SHR1.Sys16 + output: /demodisk + - input: source/SHR2.Sys16 + output: /demodisk + - input: source/SHRHello.Sys16 + output: /demodisk + - input: source/SHRLoadImage.S16 + output: /demodisk + \ No newline at end of file diff --git a/source/quit16.s b/source/quit16.s index d5a0652..6e2efbd 100644 --- a/source/quit16.s +++ b/source/quit16.s @@ -6,7 +6,7 @@ **************************************** rel ; compile as relocatable code - dsk Quit16.l ; Save Name + dsk Quit.Sys16 ; Save Name phk ; Set Data Bank to Program Bank plb ; Always do this first! diff --git a/source/shr1.s b/source/shr1.s index 80f9eb3..485641f 100644 --- a/source/shr1.s +++ b/source/shr1.s @@ -6,7 +6,7 @@ **************************************** rel ; Compile - dsk SHR1.l ; Save Name + dsk SHR1.Sys16 ; Save Name mx %00 ; Program starts in 16-bit mode phk ; Set Data Bank to Program Bank @@ -33,7 +33,6 @@ ClearNaive ldx #$0000 ; Start at first pixel jsr WaitKey - ClearFaster ldx #$7FFE ; start at top this time lda #$0000 ; store zeros :clearloop stal $E12000,x ; screen location diff --git a/source/shr2.s b/source/shr2.s index ac8492b..2497e82 100644 --- a/source/shr2.s +++ b/source/shr2.s @@ -6,7 +6,7 @@ **************************************** rel ;Compile - dsk SHR2.l ;Save Name + dsk SHR2.Sys16 ;Save Name mx %00 ;Program starts in 16-bit mode phk ;Set Data Bank to Program Bank diff --git a/source/shrhello.s b/source/shrhello.s index dc6b389..b947f4c 100644 --- a/source/shrhello.s +++ b/source/shrhello.s @@ -6,7 +6,7 @@ **************************************** rel ; Compile - dsk SHRHELLO.l ; Save Name + dsk SHRHello.Sys16 ; Save Name mx %00 phk ; Set Data Bank to Program Bank plb ; Always do this first! diff --git a/source/shrloadimg.s b/source/shrloadimg.s index 2160183..be8f657 100644 --- a/source/shrloadimg.s +++ b/source/shrloadimg.s @@ -6,7 +6,7 @@ **************************************** rel ; Compile - dsk SHRLOADIMG.l ; Save Name + dsk SHRLoadImg.S16 ; Save Name use shrloadimg.m mx %00 ; Program starts in 16-bit mode