Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-12-21 13:29:36 +00:00
Code Issues Projects Releases Wiki Activity
1,086 Commits 4 Branches 2 Tags 750 MiB
4ff2d7d902
Commit Graph

1086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Thaller
4ff2d7d902
Merge pull request #227 from mcayland/fix/update-ubuntu-version 
Dockerfile: update Ubuntu base image from 20.04 to 22.04
 2024-01-24 03:08:39 +01:00
Mark Cave-Ayland
9facdaf3c1 Dockerfile: update Ubuntu base image from 20.04 to 22.04 
The current CI build for Linux fails with the following error:

2791.4 Scanning dependencies of target ResourceFiles
2791.4 [ 68%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResourceFork.cc.o
2791.4 [ 69%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/BinaryIO.cc.o
2791.4 [ 69%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResType.cc.o
2791.4 [ 70%] Building CXX object ResourceFiles/CMakeFiles/ResourceFiles.dir/ResourceFile.cc.o
------
Dockerfile:21
--------------------
  20 |
  21 | >>> RUN mkdir /Retro68-build && \
  22 | >>>     mkdir /Retro68-build/bin && \
  23 | >>>     bash -c "cd /Retro68-build && bash /Retro68/build-toolchain.bash"

Looking back through the logs there is no sign of any specific error, however
the CI history indicates that the problem was introduced via commit e187bd21c2
("honor SOURCE_DATE_EPOCH variable when timestamping MacBinary files").

A bit of searching suggests a couple of possible reasons as to why commit e187bd21c2
could introduce a build failure: 1) the version of gcc being used may have a
buggy/incomplete implementation of std::chrono or 2) a bug in the version of cmake.

On this basis updating the Ubuntu base image from 20.04 (old LTS) to 22.04 (current
LTS) should resolve these issues, and indeed with this change applied I can
successfully build the container image from current Retro68 git as well as one of
the sample applications.
 2024-01-23 20:55:56 +00:00
Wolfgang Thaller
e187bd21c2 honor SOURCE_DATE_EPOCH variable when timestamping MacBinary files 2024-01-21 11:52:12 +01:00
Wolfgang Thaller
e43fee2701 move standalone nix build experiments to separate module 2024-01-21 11:12:34 +01:00
Wolfgang Thaller
9d542ac1c2
Merge pull request #225 from rhalkyard/macbinary-timestamp 
Set a valid timestamp on MacBinary output.
FIXME: makes nix-builds of samples non-deterministic, will need to add support for SOURCE_DATE_EPOCH.
 2024-01-15 21:06:33 +01:00
Richard Halkyard
f186dc1d57 Set a valid timestamp on MacBinary output 2024-01-04 17:30:55 -06:00
Wolfgang Thaller
e19ca07b3a
Merge pull request #222 from autc04/gcc12-update 
Update to GCC 12.2, newlib 4.2, binutils 2.39
 2023-12-29 15:31:04 +01:00
Wolfgang Thaller
398e7361a7 ADO: add texinfo to macos deps 2023-12-29 14:42:53 +01:00
Wolfgang Thaller
86146d338b Merge remote-tracking branch 'origin/master' into gcc12-update 2023-12-29 14:32:26 +01:00
Wolfgang Thaller
fcac947ce2 disable nix hardening for development shell 2023-12-29 11:30:18 +01:00
Wolfgang Thaller
1b0b725552 fix PascalString.c test 2023-12-29 11:29:49 +01:00
Wolfgang Thaller
726972f708 use macOS 13 on azure 2023-12-29 10:11:12 +01:00
Wolfgang Thaller
1857ea24e3 update version numbers in README 2023-12-29 01:50:49 +01:00
Wolfgang Thaller
57f8399076 add .direnv to .gitignore 2023-12-29 01:21:20 +01:00
Wolfgang Thaller
1d05fb39b5 fix WDEF and SystemExtension samples in Nix build 
the nix build currently puts the REZ_INCLUDE_PATH in an environment variable rather than CMake, so REZ_INCLUDE_PATH is undefined in CMake
 2023-12-29 01:20:20 +01:00
Wolfgang Thaller
cfa89940f2 remove CXXFLAGS hack for gcc9 2023-12-29 01:16:18 +01:00
Wolfgang Thaller
a777d4d585 Merge remote-tracking branch 'origin/master' into gcc12-update 2023-12-29 00:24:02 +01:00
Wolfgang Thaller
c525614549
Merge pull request #221 from autc04/flakes 
Nix Flakes
 2023-12-29 00:22:26 +01:00
Wolfgang Thaller
b6b30d2c10 setup nix source formatter 2023-12-28 23:50:29 +01:00
Wolfgang Thaller
09e4e34c41 disable garnix for now 2023-12-28 22:29:24 +01:00
Wolfgang Thaller
8063e142d7 re-enable regular build 2023-12-28 22:26:23 +01:00
Wolfgang Thaller
3516d8ca44 no reason to limit parallelism for the nix builds 
(yet, until the carbon & powerpc builds actually share a package)
 2023-12-28 22:25:29 +01:00
Wolfgang Thaller
e0d73d5329 update README for nix flakes 2023-12-28 21:34:56 +01:00
Wolfgang Thaller
504108a43a deprecate default.nix 2023-12-28 20:57:54 +01:00
Wolfgang Thaller
db9c28db76 crossPkgs -> pkgsCross 2023-12-28 20:40:32 +01:00
Wolfgang Thaller
08baa1ab70 use macos-latest and ubuntu-latest for nix builds 2023-12-28 20:40:19 +01:00
Wolfgang Thaller
ede7d46d0e hfsutils: add missing includes 2023-12-28 00:59:39 +01:00
Wolfgang Thaller
1ee050839f various fixes & workarounds for nix/mac 2023-12-27 23:51:51 +01:00
Wolfgang Thaller
3c453c897f fix --out-link option syntax 2023-12-26 23:52:27 +01:00
Wolfgang Thaller
de58f40581 try to fix a nixpkgs assert 2023-12-26 23:50:25 +01:00
Wolfgang Thaller
3193ad031c trust the right user for cache setup 2023-12-26 23:37:56 +01:00
Wolfgang Thaller
d88e9aba55 disable non-nix builds 2023-12-26 23:33:22 +01:00
Wolfgang Thaller
193610a2e1 we want nix in path 2023-12-26 23:33:00 +01:00
Wolfgang Thaller
ddfda03281 install cachix via nixpkgs#cachix 2023-12-26 23:28:47 +01:00
Wolfgang Thaller
d22b0d3184 setup nx before checkout 2023-12-26 23:26:45 +01:00
Wolfgang Thaller
9ccb30d35c use no-confirm option for nix installer 2023-12-26 23:25:43 +01:00
Wolfgang Thaller
d37d7e0612 use determinate nix installer & flake build on ADO 2023-12-26 23:22:55 +01:00
Wolfgang Thaller
97a0822244 add platform-specific samples packages 2023-12-26 23:14:38 +01:00
Wolfgang Thaller
7bebb04690 use nixos-23.11, update niv to match flake 2023-12-26 20:26:57 +01:00
Wolfgang Thaller
867b3eca74 update multiversal 2023-12-26 20:15:15 +01:00
Wolfgang Thaller
af8c831bfa add carbon to default package 2023-12-26 19:54:40 +01:00
Wolfgang Thaller
047e390419 add a 'samples' package 2023-12-26 19:53:51 +01:00
Wolfgang Thaller
2dd9d79398 add a check so that the flake can be used with submodules as well 2023-12-26 19:53:34 +01:00
Wolfgang Thaller
914ce6e144 add an url for flake-parts 2023-12-26 19:04:49 +01:00
Wolfgang Thaller
faf6b7fbbf we don't actually need libcCrossChooser 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
e51da67371 add a default package 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
963594d8d8 add .envrc 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
f98b4910dc add packages for tools & hfsutils 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
7e0e20edbd add ninja to shells 2023-12-26 18:44:00 +01:00
Wolfgang Thaller
c11fd5f303 prevent inifinite recursion for stdenvUniversal 2023-12-26 18:44:00 +01:00