diff --git a/README.md b/README.md index ff79f74..e035f47 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ binary blobs. [Forum post goes with this][1]. Clone zig and prune binary files from history: ``` -$ git clone https://github.com/ziglang/zig zig-nobinaries -$ cd zig-nobinaries +$ git clone https://github.com/ziglang/zig zig2 +$ cd zig2 $ git filter-repo --prune-empty=never --prune-degenerate never --invert-paths --path-glob 'stage1/zig1.wasm*' --path stage1/zig1.c ``` @@ -19,7 +19,7 @@ $ docker build -t zig-repro . $ docker run -ti --rm \ -v ~/code:/x \ -v /home/$USER/.cache/zig:/home/$USER/.cache/zig \ - -w /x/zig-nobinaries \ + -w /x/zig2 \ zig-repro \ sh -c "useradd -s /bin/bash -u $UID $USER && su $USER; bash" ``` diff --git a/run b/run index c5870aa..884311c 100755 --- a/run +++ b/run @@ -263,6 +263,27 @@ step09() { } } +# commit 4c1007fc044689b8cbc20634d73debb43df8efe1 +# Merge: 4172c29166 23b1544f6c +# Author: Andrew Kelley +# Date: 2023-01-02T23:11:17+02:00 +# +# Merge pull request #14002 from kcbanner/cbe_msvc_compatibility +# +STEP10=4c1007fc044689b8cbc20634d73debb43df8efe1 +STEP10_=0.10.0-1073-g4c1007fc04 +step10() { + rm -fr "../zig-$STEP10" + git archive --prefix=zig-$STEP10_/ $STEP10 | tar -C .. -x + { + pushd "../zig-$STEP10_" + ../zig-$STEP09_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1 + fullbuild + popd + } + +} + if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then set -xeuo pipefail step=${1:-step00} @@ -279,4 +300,5 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [[ "$step" -le 7 ]]; then step07; fi if [[ "$step" -le 8 ]]; then step08; fi if [[ "$step" -le 9 ]]; then step09; fi + if [[ "$step" -le 10 ]]; then step10; fi fi