Some GitHub Workflow setup #10

reinvantveer · 2021-10-13T20:07:36Z

Setting up some toolchaing stuff mainly. Already built/hosted this on quay.io for myself, but the workflow just assumes the GitHub username to be identical to the quay.io one.

reinvantveer · 2021-10-13T20:15:38Z

Ah apparently I did not sign off the commits

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…build parameter for cmake Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…machine Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…ff (fails for now) Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…uff to main Dockerfile Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…t is added to PATH Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Co-authored-by: Ricky Taylor <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

…lose` call Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

Signed-off-by: reinvantveer <[email protected]>

# Conflicts: # .dockerignore # Dockerfile # Dockerfile.megadrive # build.sh # docker-compose.yml

reinvantveer · 2021-10-14T18:01:38Z

With all the sign-off stuff going the commit history is a bit of a mess, but that doesn't bother me much if you don't mind. Apologies for any duplicated commits

ricky26

Leaving this review as a comment rather than approval because I need to look at registry credentials. There are a couple of nits but there's no particular pressure to address them ahead of this getting merged.

ricky26 · 2021-10-17T19:31:21Z

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2


Interesting, didn't know there was a magic file for dependabot, I've only used it through the UI.

ricky26 · 2021-10-17T19:31:53Z

.github/workflows/rust-m68k-cargo-megadrive-docker-image.yml

+# This Docker image only rarely, if ever, needs updating, so it should
+# only be executed manually
+on:
+#  - push
+  - workflow_dispatch


It feels like getting this to run on PR change & on merge would be nice, but that's not a problem for now.

Agreed. A bit of a thing at the moment is that I believe the megadrive cargo extension command won't compile at the moment, something to do with clap_derive at a newer beta 3 version.

ricky26 · 2021-10-17T19:35:41Z

.github/workflows/rust-m68k-cargo-megadrive-docker-image.yml

+        with:
+          file: Dockerfile.megadrive
+          # Nightly version of Rust 1.53.0 with m68k support
+          tags: ${{ secrets.DOCKER_REGISTRY_PROVIDER }}/${{ github.repository_owner }}/rust-m68k-megadrive:1.53.0-dev


nit: This tag is fixed and in more than one place. Ideally this should at least contain something unique from the repo / commit sha / git tag. Only a nit because this is a manual step.

Good suggestion, I'll have to think of something on how to include the nightly version into this, I think this is a very helpful feature of the tag.

Something resembling 1.53.0-dev-${{ commit }} or thereabouts

ricky26 · 2021-10-17T19:41:23Z

Dockerfile

@@ -1,13 +1,18 @@
-FROM rust-mega-drive:latest
+# Use custom built Rust Motorola 68000 targeted base image
+FROM quay.io/reinvantveer/rust-m68k-megadrive:1.53.0-dev


Presumably this should match the tags path from earlier? IIRC Github Packages supports docker & is free for public repos, I can probably setup the relevant secrets for that.

That would be nice, but I suspect this requires a paid account, given the current huge size of the docker image: see https://docs.github.com/en/billing/managing-billing-for-github-packages/about-billing-for-github-packages#about-billing-for-github-packages. The free tier extends up to 500 Mb but the image is way larger than that unfortunately. I'd have to do a deep dive (using Alex Goodman's excellent dive to skinny things down.

But I'll put something in place to ensure that the provider/path/image:tag stuff gets parameterized

reinvantveer changed the title ~~Some GitHub~~ Some GitHub Workflow setup Oct 13, 2021

reinvantveer added 28 commits October 14, 2021 19:51

add m68k target llvm build step

1458666

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix folder reference for CMakeLists.txt

bedcbad

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add ninja as build dependency

3b6086f

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add ninja as build dependency

0b52a88

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add ninja as build dependency

ac174e2

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add lld as build dependency

86a6743

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

remove spurious lld dependency (already present by default), drop -B …

8ed804c

…build parameter for cmake Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

swap lld linker for 'gold' to fix cmake error

e2d80be

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

github actions will not work here: not enough disk space on standard …

662ddb3

…machine Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

build forked llvm with m68k support

7f28c2e

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

build forked Rust toolchain, fails on missing llvm-c/BitReader.h

0d8352a

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

maybe fix missing header file by building with install

c00678b

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

show progress on huge checkout

fd2160e

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

parameterize jobs for compilation, merge build and install steps

4f6a3a8

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

switch to llvm release build instead of release with debug info

901ca9a

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix installation dependencies in pkg-config, libssl-dev and rustup

08499de

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

rename to toolchain extension

6a05d6f

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

combine toolchain build deps, clean apt cache

0b99477

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

link build toolchain to m68k name, (try to) build sega mega drive stu…

ea0e4b7

…ff (fails for now) Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix unavailable panic unwind 'eh_personality' error by aborting on panic

b16a4b5

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix cargo path commands

637c44f

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add maintainer, add $HOME/.cargo/bin to path, move rust-mega-drive st…

4508613

…uff to main Dockerfile Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix path reference

6c15a96

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add some dockerized build instructions

345506d

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

interpunction

a99bdf6

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

replace HOME-relative cargo invocation with simple cargo now that i…

9284396

…t is added to PATH Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

ignore git and docker stuff to put into docker image

cd663df

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

move megapong compilation into default docker CMD

fc8ac60

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

reinvantveer and others added 26 commits October 14, 2021 19:52

center text on screen

5cd8623

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

roll only if A button on controller 1 is pressed

f9886be

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

open file with context manager

2e8d8b0

Signed-off-by: reinvantveer <[email protected]> Co-authored-by: Ricky Taylor <[email protected]> Signed-off-by: reinvantveer <[email protected]>

extract out boilerplate string

64bd8cc

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add indents to wrapping open context manager, drop now-redundant `c…

dd726ed

…lose` call Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add opt-out/default-enabled feature for a default panic handler

84a06ff

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add documentation for util crate

8712e6d

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

move Python font bootstrapping artifacts into graphics crate

30ccbfe

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

drop dunder init - no package necessary

a49dd82

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add build script basics

89b627a

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

add cpython build dependency

1e36c42

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

fix module generator out

614df98

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

use specific python3 command instead of legacy python

97d3ab1

Signed-off-by: reinvantveer <[email protected]> Signed-off-by: reinvantveer <[email protected]>

generate to environment variable specified OUTPUT_DIR

700f050

Signed-off-by: reinvantveer <[email protected]>

don't stick char NUL in default_font.rs

3ac9098

Signed-off-by: reinvantveer <[email protected]>

fix script name

39c91c9

Signed-off-by: reinvantveer <[email protected]>

drop module from version control generated by build.rs

41d8906

Signed-off-by: reinvantveer <[email protected]>

rerun on changed output module, input script or build script

ff6404b

Signed-off-by: reinvantveer <[email protected]>

make lib.rs load contents from module directly using include macro

24db936

Signed-off-by: reinvantveer <[email protected]>

add python3-pip dependency

938b8e1

Signed-off-by: reinvantveer <[email protected]>

drop redundant rebuild checks

65ae438

Signed-off-by: reinvantveer <[email protected]>

Repurpose main Dockerfile for installing the cargo 'megadrive' command

c1242ee

Signed-off-by: reinvantveer <[email protected]>

Use docker-compose to build and copy examples

7ef8ab0

Signed-off-by: reinvantveer <[email protected]>

use build context with megadrive command Dockerfile

d6c054e

Signed-off-by: reinvantveer <[email protected]>

fix example build setup

9029587

Signed-off-by: reinvantveer <[email protected]>

add things to ignore in rebuilding

195fc38

Signed-off-by: reinvantveer <[email protected]>

reinvantveer force-pushed the workflows branch from 4b62299 to 195fc38 Compare October 14, 2021 17:52

Merge branch 'main' into workflows

5eea021

# Conflicts: # .dockerignore # Dockerfile # Dockerfile.megadrive # build.sh # docker-compose.yml

ricky26 reviewed Oct 17, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some GitHub Workflow setup #10

Some GitHub Workflow setup #10

reinvantveer commented Oct 13, 2021

reinvantveer commented Oct 13, 2021

reinvantveer commented Oct 14, 2021 •

edited

Loading

ricky26 left a comment

ricky26 Oct 17, 2021

ricky26 Oct 17, 2021

reinvantveer Oct 18, 2021

ricky26 Oct 17, 2021

reinvantveer Oct 18, 2021

reinvantveer Oct 18, 2021

ricky26 Oct 17, 2021

reinvantveer Oct 18, 2021 •

edited

Loading

reinvantveer Oct 18, 2021

Some GitHub Workflow setup #10

Are you sure you want to change the base?

Some GitHub Workflow setup #10

Conversation

reinvantveer commented Oct 13, 2021

reinvantveer commented Oct 13, 2021

reinvantveer commented Oct 14, 2021 • edited Loading

ricky26 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reinvantveer Oct 18, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

reinvantveer commented Oct 14, 2021 •

edited

Loading

reinvantveer Oct 18, 2021 •

edited

Loading