Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve buildability by using Docker #59

Merged
merged 15 commits into from
Jun 22, 2022
Merged
27 changes: 27 additions & 0 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Makefile CI

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: configure
run: ./configure

- name: Install dependencies
run: make

- name: Run check
run: make check

- name: Run distcheck
run: make distcheck
2 changes: 1 addition & 1 deletion v2/asm/irqhn.asm
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ dispd3:
jsr dispdt
lda d1str+6
jsr dispdt
lda #','
lda #$2c
Pinacolada64 marked this conversation as resolved.
Show resolved Hide resolved
jsr dispdt
lda #' '
jsr dispdt
Expand Down
2 changes: 1 addition & 1 deletion v2/asm/swap3.asm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ movie1:
pha
jsr clrchn
ldx movdly
ldy#0
ldy #0
dl1:
dey
bne dl1
Expand Down
26 changes: 26 additions & 0 deletions v2/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:latest

RUN apt-get update \
&& apt install -y --no-install-recommends \
apt-transport-https \
ca-certificates \
build-essential \
wget \
gnupg \
gpg-agent \
unzip

# Adapted from https://github.com/scottyhardy/docker-wine/blob/master/Dockerfile
# Install wine
ARG WINE_BRANCH="stable"
ARG C64LIST_VER="4.04"
RUN wget -nv -O- https://dl.winehq.org/wine-builds/winehq.key | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
&& echo "deb https://dl.winehq.org/wine-builds/ubuntu/ $(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2) main" >> /etc/apt/sources.list \
&& dpkg --add-architecture i386 \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y --install-recommends wine-${WINE_BRANCH}

RUN apt install -y libwine --install-recommends \
&& apt update \
&& apt install -y wine32 --no-install-recommends

COPY files/C64List${C64LIST_VER}/Win32/C64List.exe /bin/C64List.exe
3 changes: 3 additions & 0 deletions v2/docker/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

docker build -t imagebbs_docker .
Binary file not shown.
Binary file added v2/docker/files/C64List4.04/Win32/C64List.exe
Binary file not shown.
Binary file added v2/docker/files/C64List4.04/Win64/C64List.exe
Binary file not shown.
5 changes: 5 additions & 0 deletions v2/docker/files/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# C64List

The C64List binaries and .docx files were downloaded from (here)[http://commodoreserver.com/BlogEntryView.asp?EID=8AA5A8C601114E8C8FEEC094A758FABA]
and are included in this Git repository for simplicity.