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.

Sign up for GitHub

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

Jump to bottom

Some GitHub Workflow setup #10

Open

reinvantveer wants to merge 185 commits into ricky26:main from reinvantveer:workflows

Contributor

reinvantveer commented Oct 13, 2021

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 changed the title ~~Some GitHub~~ Some GitHub Workflow setup

Contributor Author

reinvantveer commented Oct 13, 2021

Ah apparently I did not sign off the commits

reinvantveer added 28 commits

October 14, 2021 19:51


          add m68k target llvm build step

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          fix folder reference for CMakeLists.txt

bedcbad

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add ninja as build dependency

3b6086f

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add ninja as build dependency

0b52a88

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add ninja as build dependency

ac174e2

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add lld as build dependency

86a6743

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

8ed804c

…build parameter for cmake

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          swap lld linker for 'gold' to fix cmake error

e2d80be

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

662ddb3

…machine

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          build forked llvm with m68k support

7f28c2e

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

0d8352a

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          maybe fix missing header file by building with install

c00678b

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          show progress on huge checkout

fd2160e

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          parameterize jobs for compilation, merge build and install steps

4f6a3a8

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          switch to llvm release build instead of release with debug info

901ca9a

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

08499de

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          rename to toolchain extension

6a05d6f

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          combine toolchain build deps, clean apt cache

0b99477

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

ea0e4b7

…ff (fails for now)

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

b16a4b5

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          fix cargo path commands

637c44f

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

…uff to main Dockerfile

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          fix path reference

6c15a96

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add some dockerized build instructions

345506d

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          interpunction

a99bdf6

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

…t is added to PATH

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          ignore git and docker stuff to put into docker image

cd663df

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          move megapong compilation into default docker CMD

fc8ac60

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>

reinvantveer and others added 26 commits

October 14, 2021 19:52


          center text on screen

5cd8623

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          roll only if A button on controller 1 is pressed

f9886be

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          open file with context manager

2e8d8b0

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Co-authored-by: Ricky Taylor <rickytaylor26@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          extract out boilerplate string

64bd8cc

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

dd726ed

…lose` call

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


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

84a06ff

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add documentation for util crate

8712e6d

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          move Python font bootstrapping artifacts into graphics crate

30ccbfe

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          drop dunder init - no package necessary

a49dd82

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add build script basics

89b627a

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          add cpython build dependency

1e36c42

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          fix module generator out

614df98

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          use specific python3 command instead of legacy python

97d3ab1

Signed-off-by: reinvantveer <reinvantveer@gmail.com>
Signed-off-by: reinvantveer <rein@vantveer.me>


          generate to environment variable specified OUTPUT_DIR

700f050

Signed-off-by: reinvantveer <rein@vantveer.me>


          don't stick char NUL in default_font.rs

3ac9098

Signed-off-by: reinvantveer <rein@vantveer.me>


          fix script name

39c91c9

Signed-off-by: reinvantveer <rein@vantveer.me>


          drop module from version control generated by build.rs

41d8906

Signed-off-by: reinvantveer <rein@vantveer.me>


          rerun on changed output module, input script or build script

ff6404b

Signed-off-by: reinvantveer <rein@vantveer.me>


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

24db936

Signed-off-by: reinvantveer <rein@vantveer.me>


          add python3-pip dependency

938b8e1

Signed-off-by: reinvantveer <rein@vantveer.me>


          drop redundant rebuild checks

65ae438

Signed-off-by: reinvantveer <rein@vantveer.me>


          Repurpose main Dockerfile for installing the cargo 'megadrive' command

c1242ee

Signed-off-by: reinvantveer <rein@vantveer.me>


          Use docker-compose to build and copy examples

7ef8ab0

Signed-off-by: reinvantveer <rein@vantveer.me>


          use build context with megadrive command Dockerfile

d6c054e

Signed-off-by: reinvantveer <rein@vantveer.me>


          fix example build setup

Signed-off-by: reinvantveer <rein@vantveer.me>


          add things to ignore in rebuilding

195fc38

Signed-off-by: reinvantveer <rein@vantveer.me>

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

Contributor Author

reinvantveer commented Oct 14, 2021 •

edited

Loading

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 reviewed

View reviewed changes

Owner

ricky26 left a comment

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.

.github/dependabot.yml

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

Owner

ricky26 Oct 17, 2021

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

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

Comment on lines +8 to +12

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

Owner

ricky26 Oct 17, 2021

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

Contributor Author

reinvantveer Oct 18, 2021

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.

.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

Owner

ricky26 Oct 17, 2021

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.

Contributor Author

reinvantveer Oct 18, 2021

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.

Contributor Author

reinvantveer Oct 18, 2021

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

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

Owner

ricky26 Oct 17, 2021

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.

Contributor Author

reinvantveer Oct 18, 2021 •

edited

Loading

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.

Contributor Author

reinvantveer Oct 18, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet