From 0b44dce1f6c5930f6f59c8b33b80fe6d51983e7d Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.gello@gmail.com>
Date: Wed, 2 Aug 2023 17:44:38 +0300
Subject: [PATCH] Rename build directory for Windows x86_64

Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
---
 .github/workflows/build_cromite.yaml | 24 ++++++++++++------------
 .github/workflows/release.yaml       |  5 ++---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml
index 0ee5875e..47339328 100644
--- a/.github/workflows/build_cromite.yaml
+++ b/.github/workflows/build_cromite.yaml
@@ -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') }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a5c43526..3e854ee1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -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/