PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename build directory for Windows x86_64

Browse Source 
Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
This commit is contained in:
Vasyl Gello
2023-10-10 04:15:19 -11:00
committed by uazo
parent 0fa437c23c
commit 0b44dce1f6
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_cromite.yaml
+12 -12
View File
@@ -177,7 +177,7 @@ jobs:
volumes:
- /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite
- /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/bromite-android-x86_64
- /storage/images/${{ github.event.inputs.sha }}/win/x64:/home/lg/working_dir/chromium/src/out/bromite_win
- /storage/images/${{ github.event.inputs.sha }}/win/x64:/home/lg/working_dir/chromium/src/out/bromite-windows-x86_64
- /tmp/proxy:/tmp/proxy
- /win_sdk:/win_sdk
@@ -200,9 +200,9 @@ jobs:
sudo chown lg chromium/src/out &&
sudo chown lg chromium/src/out/bromite
test -d chromium/src/out/bromite_win || sudo mkdir -p chromium/src/out/bromite_win && \
test -d chromium/src/out/bromite-windows-x86_64 || sudo mkdir -p chromium/src/out/bromite-windows-x86_64 && \
sudo chown lg chromium/src/out &&
sudo chown lg chromium/src/out/bromite_win
sudo chown lg chromium/src/out/bromite-windows-x86_64
test -d chromium/src/out/bromite-android-x86_64 || sudo mkdir -p chromium/src/out/bromite-android-x86_64 && \
sudo chown lg chromium/src/out &&
@@ -251,7 +251,7 @@ jobs:
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$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
- name: Build Bromite Windows x86_64
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
shell: bash
run: |
@@ -259,25 +259,25 @@ jobs:
cd $WORKSPACE/chromium/src
echo "::group::-------- gn gen"
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_os = \"win\" $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite_win
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_os = \"win\" $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite-windows-x86_64
echo "::endgroup::"
echo "::group::-------- gn args"
gn args out/bromite_win/ --list --short
gn args out/bromite_win/ --list >out/bromite_win/gn_list
gn args out/bromite-windows-x86_64/ --list --short
gn args out/bromite-windows-x86_64/ --list >out/bromite-windows-x86_64/gn_list
echo "::endgroup::"
ninja -C out/bromite_win chrome
ninja -C out/bromite-windows-x86_64 chrome
cp ../../bromite/build/RELEASE out/bromite_win
cp ../../bromite/build/RELEASE out/bromite-windows-x86_64
- name: Get ninja logs Windows
- name: Get ninja logs Windows x86_64
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
shell: bash
run: |
cd $WORKSPACE
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$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
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite-windows-x86_64/.ninja_log >$WORKSPACE/chromium/src/out/bromite-windows-x86_64/ninja_log_trace.json
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite-windows-x86_64/ninja_log_trace.json
- name: Build Bromite Android x86_64
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
.github/workflows/release.yaml
+2 -3
View File
@@ -105,9 +105,8 @@ jobs:
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
echo "::endgroup::"
echo "::group::-------- windows"
# windows x86_64
echo "::group::-------- windows x64"
mkdir chrome-win/
cp $WINOUT/*.manifest chrome-win/
cp $WINOUT/chrome.dll chrome-win/