diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml new file mode 100644 index 0000000..c67f418 --- /dev/null +++ b/.github/workflows/makefile.yml @@ -0,0 +1,43 @@ +name: Makefile CI + +on: + workflow_dispatch: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ubuntu-latest + container: + image: dmcoles/amiga-evo-cicd + credentials: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + steps: + - uses: actions/checkout@v4 + - name: run build + run: | + vamos -c /usr/amiga/.vamosrc --cwd esource: -V system:/usr/amiga -V esource:$GITHUB_WORKSPACE make build=release + + - name: add build artifacts to publish + run: | + apk add lha + mkdir downloads + mkdir downloads/utils + cp $GITHUB_WORKSPACE/rebuild downloads + cp $GITHUB_WORKSPACE/rebuild.info downloads + cp $GITHUB_WORKSPACE/Rebuild_manual.txt downloads + cp $GITHUB_WORKSPACE/Rebuild_manual.txt.info downloads + cd downloads + lha a ../rebuild-nightly${{ github.sha }}.lha * + ls ../ + + - name: Update nightly release + uses: pyTooling/Actions/releaser@main + with: + tag: dev-build + rm: true + token: ${{ secrets.GITHUB_TOKEN }} + files: rebuild-nightly${{ github.sha }}.lha diff --git a/penmapObject.e b/penmapObject.e index dfd7b8a..2d92faf 100644 --- a/penmapObject.e +++ b/penmapObject.e @@ -254,6 +254,7 @@ EXPORT PROC createPreviewObject(scr) OF penMapObject PENMAP_TRANSPARENT, self.transparent, PENMAP_SCREEN, scr, PENMAP_RENDERDATA, self.bitmapData, + PENMAP_PALETTE,[2,-1,-1,-1,0,0,0]:LONG, ->LABEL_DRAWINFO, self.drawInfo, TAG_DONE]) IF self.previewObject=0 THEN self.previewObject:=self.createErrorObject(scr) diff --git a/reactionObject.e b/reactionObject.e index 36ea211..7ea1200 100644 --- a/reactionObject.e +++ b/reactionObject.e @@ -759,6 +759,7 @@ EXPORT PROC createErrorObject(scr) OF reactionObject ENDPROC NewObjectA(PenMap_GetClass(),NIL, [PENMAP_RENDERDATA, imageData, PENMAP_SCREEN, scr, + PENMAP_PALETTE,[2,-1,-1,-1,0,0,0]:LONG, TAG_DONE]) EXPORT PROC getObjId() IS objCount