Compare commits

..

4 Commits

Author SHA1 Message Date
uazo
7e8fa5f370 Use sdk 10.0.22621.0
fix https://github.com/uazo/bromite-buildtools/issues/43
2023-04-04 06:33:48 +00:00
uazo
23701f3eb8 Merge pull request #126 from uazo/uazo-patch-1
Force use python3 for trace2html
2023-04-04 06:30:45 +00:00
uazo
9bfaadc2f6 Fix trace2html 2023-04-04 06:29:19 +00:00
Carmelo Messina
873b33fe1b do not export the patch if it is tagged with NOEXPORT 2023-03-24 15:47:50 +01:00
3 changed files with 17 additions and 5 deletions

View File

@@ -172,9 +172,9 @@ jobs:
KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe
# cross build
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.20348.0/
WINDOWSSDKDIR: "/win_sdk/10.0.20348.0/Windows Kits/10/"
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.20348.0/
DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
# compile in debug mode
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
TARGET_CPU: ${{ github.event.inputs.build }}
@@ -242,7 +242,7 @@ jobs:
run: |
cd $WORKSPACE
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
$WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
- name: Build Bromite Windows
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
@@ -270,7 +270,7 @@ jobs:
run: |
cd $WORKSPACE
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
$WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
- name: Generate breakpad symbols
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}

View File

@@ -16,6 +16,11 @@ for patch in $ALLPATCHS_E; do
if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
continue
fi
PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
then
continue
fi
if [[ -z "$PATCH_FILE" ]]; then
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
fi

View File

@@ -13,6 +13,13 @@ else
echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE
fi
PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
then
echo Request NO export
exit 0
fi
git -C ~/chromium/src/ format-patch -1 --keep-subject --stdout --full-index --zero-commit --no-signature $patch >~/bromite/build/patches-new/$PATCH_FILE
echo " exported"