Skip to content

Commit

Permalink
fix os4 issues with penmap and bitmap objects
Browse files Browse the repository at this point in the history
add gitgub workflow
  • Loading branch information
dmcoles committed May 6, 2024
1 parent 2e6c950 commit 120e2b8
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 0 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions penmapObject.e
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions reactionObject.e
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 120e2b8

Please sign in to comment.