diff --git a/.github/scripts/github_before_build.sh b/.github/scripts/github_before_build.sh index d209288..5eb7667 100755 --- a/.github/scripts/github_before_build.sh +++ b/.github/scripts/github_before_build.sh @@ -39,7 +39,7 @@ if [[ $_arch == "arm64" ]]; then _rust_target="aarch64-apple-darwin" fi -/usr/bin/arch -$_arch $_python_path/python3 ./tools/gn/bootstrap/bootstrap.py -o out/Default/gn --skip-generate-buildfiles -/usr/bin/arch -$_arch $_python_path/python3 ./tools/rust/build_bindgen.py --rust-target $_rust_target +/usr/bin/arch -$_target_cpu $_python_path/python3 ./tools/gn/bootstrap/bootstrap.py -o out/Default/gn --skip-generate-buildfiles +/usr/bin/arch -$_target_cpu $_python_path/python3 ./tools/rust/build_bindgen.py --rust-target $_rust_target -/usr/bin/arch -$_arch ./out/Default/gn gen out/Default --fail-on-unused-args +/usr/bin/arch -$_target_cpu ./out/Default/gn gen out/Default --fail-on-unused-args diff --git a/.github/scripts/github_build.sh b/.github/scripts/github_build.sh index c7b5cdf..a7743e9 100755 --- a/.github/scripts/github_build.sh +++ b/.github/scripts/github_build.sh @@ -28,7 +28,7 @@ cd build/src echo $(date +%s) | tee -a "$_root_dir/build_times_$_target_cpu.log" echo "status=running" >> $GITHUB_OUTPUT -timeout -k 7m -s SIGTERM ${_remaining_time:-19680}s /usr/bin/arch -$_arch $_ninja_path/ninja -C out/Default chrome chromedriver # 328 m as default $_remaining_time +timeout -k 7m -s SIGTERM ${_remaining_time:-19680}s /usr/bin/arch -$_target_cpu $_ninja_path/ninja -C out/Default chrome chromedriver # 328 m as default $_remaining_time echo $(date +%s) | tee "$_root_dir/build_finished_$_target_cpu.log" echo "status=finished" >> $GITHUB_OUTPUT diff --git a/.github/scripts/github_fetch_resources.sh b/.github/scripts/github_fetch_resources.sh index 323abec..045657d 100755 --- a/.github/scripts/github_fetch_resources.sh +++ b/.github/scripts/github_fetch_resources.sh @@ -25,17 +25,17 @@ sudo du -hs "$_src_dir" rm -rf "$_src_dir/out" || true mkdir -p "$_download_cache" -/usr/bin/arch -$_arch /bin/bash "$_root_dir/retrieve_and_unpack_resource.sh" -g +/usr/bin/arch -$_target_cpu /bin/bash "$_root_dir/retrieve_and_unpack_resource.sh" -g mkdir -p "$_src_dir/out/Default" -/usr/bin/arch -$_arch $_python_path/python3 "$_main_repo/utils/prune_binaries.py" "$_src_dir" "$_main_repo/pruning.list" -/usr/bin/arch -$_arch $_python_path/python3 "$_main_repo/utils/patches.py" apply "$_src_dir" "$_main_repo/patches" "$_root_dir/patches" -/usr/bin/arch -$_arch $_python_path/python3 "$_main_repo/utils/domain_substitution.py" apply -r "$_main_repo/domain_regex.list" -f "$_main_repo/domain_substitution.list" "$_src_dir" +/usr/bin/arch -$_target_cpu $_python_path/python3 "$_main_repo/utils/prune_binaries.py" "$_src_dir" "$_main_repo/pruning.list" +/usr/bin/arch -$_target_cpu $_python_path/python3 "$_main_repo/utils/patches.py" apply "$_src_dir" "$_main_repo/patches" "$_root_dir/patches" +/usr/bin/arch -$_target_cpu $_python_path/python3 "$_main_repo/utils/domain_substitution.py" apply -r "$_main_repo/domain_regex.list" -f "$_main_repo/domain_substitution.list" "$_src_dir" mkdir -p "$_src_dir/third_party/llvm-build/Release+Asserts" mkdir -p "$_src_dir/third_party/rust-toolchain/bin" -/usr/bin/arch -$_arch /bin/bash "$_root_dir/retrieve_and_unpack_resource.sh" -p +/usr/bin/arch -$_target_cpu /bin/bash "$_root_dir/retrieve_and_unpack_resource.sh" -p rm -rvf "$_download_cache"