Update release.yaml

.github/workflows/build-images.yaml

@@ -3,7 +3,7 @@ permissions:
   checks: none
   contents: none
   deployments: none
-  issues: none
+  issues: write
   packages: none
   pull-requests: none
   repository-projects: none
@@ -18,10 +18,11 @@ on:
         required: false
         default: ''
   schedule: 
-   - cron: '0 5 * * *'
+   - cron: '0 1 * * *'
         
 env:
   VERSION: ${{ github.event.inputs.version }}
+  NEW_VERSION: ${{ null }}
   
 name: Builds and pushes tagged image to DockerHub
 jobs:
@@ -34,9 +35,9 @@ jobs:
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /opt/ghc
-          sudo apt-get remove google-cloud-sdk azure-cli hhvm google-chrome-stable \
-                       firefox mysql-server-core-8.0 mono-devel mongodb-org-server podman mongodb-org-mongos \
-                       powershell dotnet-runtime-3.1 dotnet-runtime-5.0 dotnet-sdk-3.1 dotnet-sdk-5.0
+          sudo apt-get remove google-cloud-sdk azure-cli google-chrome-stable \
+                       firefox mysql-server-core-8.0 mono-devel podman \
+                       powershell
           sudo apt-get autoremove
           
       - name: Checkout repo
@@ -74,6 +75,7 @@ jobs:
                 bromite-buildtools/images/build-deps/.
               
               docker push uazo/build-deps:$VERSION
+              echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
             fi
           fi          
 
@@ -91,6 +93,21 @@ jobs:
                 bromite-buildtools/images/chr-source/.
                 
               docker push uazo/chromium:$VERSION
+              echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
             fi
           fi
+
+      - name: Create issue ${{ env.VERSION }}
+        if: "${{ env.NEW_VERSION != '' }}"
+        shell: bash
+        run: |
+          GH=../gh_2.18.1_linux_amd64/bin/gh
+          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
+          tar xfz gh_2.18.1_linux_amd64.tar.gz
+          
+          cd bromite-buildtools
+          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
+          $GH issue create -t "$VERSION: new stable chromium version" -b ""
+          
+          
           

.github/workflows/build_bromite_dev.yaml

@@ -251,7 +251,7 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") target_cpu = \"x64\" target_os = \"win\" $(cat ../../build_args.gni) " 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_win
           echo "::endgroup::"
 
           echo "::group::-------- gn args"

.github/workflows/check_git_apply.yaml

@@ -0,0 +1,138 @@
+name: Check git apply
+  
+on:
+  workflow_dispatch:
+    inputs:
+      rtag:
+        description: 'uazo/bromite TAG or COMMIT'
+        required: true
+        default: ''
+      branch:
+        description: 'uazo/bromite BRANCH'
+        required: true
+        default: ''
+        
+env:
+  GITHUB_SHA: ${{ github.event.inputs.rtag }}
+  BROMITE_SHA: ${{ github.event.inputs.rtag }}
+  USEINTERNALNETWORK: false  # CUSTOM RUNNER: create the docker network as internal
+  REMOVEDOCKERSUPPORT: false # CUSTOM RUNNER: remove sharing of docker socket
+  https_proxy: http://172.18.0.1:8118
+  http_proxy: http://172.18.0.1:8118
+jobs:
+  get-git-apply:
+    runs-on: ci
+    container:
+      image: uazo/build-deps:latest
+      env:
+        GITHUB_SHA: ${{ github.event.inputs.rtag }}
+        USELOCALIMAGE: true        # CUSTOM RUNNER: permit use of local images
+        REMOVEDOCKERSUPPORT: false # CUSTOM RUNNER: remove sharing of docker socket
+      volumes:
+        - /tmp/proxy:/tmp/proxy
+        
+    steps:
+          
+      - name: Prepare container
+        run: |
+          sudo chown lg /etc/apt/apt.conf.d/proxy.conf
+          sudo chown lg .
+          sudo echo Acquire::http::Proxy \"http://172.18.0.1:8118\"\; >/etc/apt/apt.conf.d/proxy.conf
+          #export HTTPS_PROXY=http://172.18.0.1:8118
+          #export HTTP_PROXY=http://172.18.0.1:8118
+          #export http_proxy=http://172.18.0.1:8118
+          #export https_proxy=http://172.18.0.1:8118
+          
+          sudo chmod 777 /__w/_temp
+
+          wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+          sudo dpkg -i packages-microsoft-prod.deb
+          rm packages-microsoft-prod.deb
+          
+          sudo apt update
+          sudo apt install -y wget unzip tar sed dos2unix patchutils wiggle curl nano aspnetcore-runtime-6.0
+          
+          wget https://github.com/uazo/superpatch/releases/latest/download/SuperPatchUtils.tar.gz
+          tar xfz SuperPatchUtils.tar.gz
+          rm SuperPatchUtils.tar.gz
+          
+          git clone https://github.com/uazo/bromite-buildtools
+          
+          #wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
+          #unzip pup_v0.4.0_linux_amd64.zip
+          #rm pup_v0.4.0_linux_amd64.zip
+          #BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$GITHUB_SHA | ./pup -p li.branch:last-child a text{})
+          
+          test -d /github/home/.vscode-server || sudo mkdir /github/home/.vscode-server
+          sudo chown lg /github/home/.vscode-server
+          
+      - name: Checkout 'uazo/bromite'
+        uses: actions/checkout@v2
+        with:
+            repository: 'uazo/bromite'
+            ref: ${{ github.event.inputs.rtag }}
+            path: 'bromite'
+            fetch-depth: 1
+    
+      - name: Create chromium sources
+        run: |
+          #sleep 2h
+          VERSION=$(cat bromite/build/RELEASE)
+          ./bin/SuperPatchUtils bromite $BROMITE_SHA chromium/src
+          
+          cd chromium/src
+          git init
+          git config user.email "you@example.com"
+          git config user.name "Your Name"
+          git add .
+          git commit -m $VERSION
+          git tag -a $VERSION -m $VERSION
+          
+      - name: Apply patches ${{ github.event.inputs.rtag }}
+        run: |
+          export HOME=$(pwd)
+          cd ~/chromium/src
+          
+          export SILENT=true
+          export CGA_REMOTE=true
+          export SKIPAUTOGENERATED=true
+          bash ~/bromite-buildtools/apply-all-patch.sh || sleep 23h || true
+          
+          rm -rf ~/bromite/build/patches-new/
+          rm ~/bromite/build/bromite_patches_list_new.txt
+          
+      - name: Export patches
+        run: |
+          export HOME=$(pwd)
+          
+          cd ~/chromium/src          
+          bash ~/bromite-buildtools/export-all-patch.sh
+          
+          cd ~/bromite
+          rm -rf build/patches/*
+          mv build/patches-new/* build/patches
+          rm -rf build/patches-new/
+          
+      - name: Check differences CHANGES=${{ env.CHANGES }}
+        run: |
+          cd bromite
+          CHANGES=0 && git diff --quiet || CHANGES=1
+          
+          if [[ CHANGES -eq 1 ]]; then
+              git add build/patches/*.patch
+              git diff --name-only --staged
+          fi
+          
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        with:
+          token: ${{ secrets.BROMITE_PULLS_PAT }}
+          path: bromite
+          base: ${{ github.event.inputs.branch }}
+          add-paths: |
+            build/patches/*.patch
+          commit-message: 'AUTOMATED - git apply results'
+          title: Git apply result for ${{ github.event.inputs.branch }} branch
+          body: ${{ env.MESSAGE }}
+          delete-branch: true
+          branch-suffix: short-commit-hash

.github/workflows/release.yaml

@@ -39,8 +39,8 @@ jobs:
           BRANCH=$(curl https://github.com/uazo/bromite/branch_commits/$BROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
           echo "BRANCH=$BRANCH" >> $GITHUB_ENV
 
-          wget https://github.com/cli/cli/releases/download/v2.4.0/gh_2.4.0_linux_amd64.tar.gz
-          tar xfz gh_2.4.0_linux_amd64.tar.gz
+          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
+          tar xfz gh_2.18.1_linux_amd64.tar.gz
 
       - name: Checkout 'uazo/buildtools'
         uses: actions/checkout@v2
@@ -49,19 +49,86 @@ jobs:
             path: 'bromite'
             fetch-depth: 1
             
-      - name: Copy artifacts
-        shell: bash
-        run: |
-          sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
-          sudo chown runner ChromePublic.apk
-          mv ChromePublic.apk $APK
-
       - name: Create release
         shell: bash
         run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | gh_2.4.0_linux_amd64/bin/gh auth login --with-token
-          
-          cd bromite
+          GH=gh_2.18.1_linux_amd64/bin/gh
+          WINOUT=/storage/images/win/x64/$BROMITE_SHA/
           VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
-          ../gh_2.4.0_linux_amd64/bin/gh release create $VERSION-$BROMITE_SHA \
-            ../$APK --notes "" -p
+
+          cd bromite
+
+          GH=gh_2.18.1_linux_amd64/bin/gh
+          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
+          tar xfz gh_2.18.1_linux_amd64.tar.gz
+          
+          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
+
+          echo "\`\`\`" >note
+          echo "this is not the official release of bromite but a test version." >>note
+          echo "you can try it at your own risk." >>note
+          echo "\`\`\`" >>note
+
+          $GH release create $VERSION-$BROMITE_SHA --notes-file note -d
+
+          # android
+          sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
+          sudo chown runner ChromePublic.apk
+          mv ChromePublic.apk $APK
+          echo Uploading $APK
+          $GH release upload $VERSION-$BROMITE_SHA $APK
+          
+          echo Uploading chrome.size
+          test $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size && \
+            $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
+
+          echo Uploading arm64_ninja_log_trace.html
+          test $OUTPUTFILE/ninja_log_trace.html && \
+            cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html && \
+            $GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
+
+          # windows
+          mkdir chrome-win/
+          cp $WINOUT/*.manifest chrome-win/
+          cp $WINOUT/chrome.dll chrome-win/
+          cp $WINOUT/chrome.exe chrome-win/
+          cp $WINOUT/chrome_100_percent.pak chrome-win/
+          cp $WINOUT/chrome_200_percent.pak chrome-win/
+          cp $WINOUT/chrome_elf.dll chrome-win/
+          cp $WINOUT/chrome_proxy.exe chrome-win/
+          cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
+          cp $WINOUT/chrome_wer.dll chrome-win/
+          cp "/win_sdk/10.0.20348.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
+          cp $WINOUT/elevation_service.exe chrome-win/
+          cp "$WINOUT/First Run" chrome-win/
+          cp $WINOUT/headless_lib_data.pak chrome-win/
+          cp $WINOUT/icudtl.dat chrome-win/
+          cp $WINOUT/libEGL.dll chrome-win/
+          cp $WINOUT/libGLESv2.dll chrome-win/
+          cp $WINOUT/Logo.png chrome-win/
+          cp $WINOUT/mojo_core.dll chrome-win/
+          cp $WINOUT/notification_helper.exe chrome-win/
+          cp $WINOUT/resources.pak chrome-win/
+          cp $WINOUT/SmallLogo.png chrome-win/
+          cp $WINOUT/snapshot_blob.bin chrome-win/
+          cp $WINOUT/VkICD_mock_icd.dll chrome-win/
+          cp $WINOUT/VkLayer_khronos_validation.dll chrome-win/
+          cp $WINOUT/vk_swiftshader.dll chrome-win/
+          cp $WINOUT/vulkan-1.dll chrome-win/
+          cp -r $WINOUT/locales chrome-win/locales
+
+          zip -r chrome-win.zip chrome-win/
+          
+          echo Uploading chrome-win.zip
+          $GH release upload $VERSION-$BROMITE_SHA chrome-win.zip
+          
+          # workaround for https://github.com/cli/cli/issues/6599
+          sleep 30s
+
+          TIMESTAMP=$(date +%s -r chrome-win.zip)
+          echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/bromite-buildtools/releases;download=https://github.com/uazo/bromite-buildtools/releases/latest/download/chrome-win.zip;version=$(cat $WINOUT/RELEASE);revision=1;commit=$BROMITE_SHA"
+          $GH release upload $VERSION-$BROMITE_SHA updateurl.txt
+
+          $GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
+          $GH release edit $VERSION-$BROMITE_SHA --draft=false
+          

README.md

@@ -35,7 +35,31 @@ RUNNER_LABELS=dev
 ALLOWEDAUTHORSLIST=uazo
 ```
 
-5. Start the runner
+5. Prepare for windows cross build
+Follow the [instructions](https://chromium.googlesource.com/chromium/src.git/+/HEAD/docs/win_cross.md#if-you_re-not-at-google) to create the zip with the toolchain
+
+example:
+```
+cd path\to\depot_tools\win_toolchain
+D:\Downloads\depot_tools\win_toolchain> package_from_installed.py --allow_multiple_vs_installs -w 10.0.20348.0 2019
+```
+
+create the `/casefold` in the unix host with [casefold attribute](https://unix.stackexchange.com/questions/558977/how-to-enable-new-in-kernel-5-2-case-insensitivity-for-ext4-on-a-given-directory) and unzip the contents into.
+```
+~$ ls /casefold/10.0.20348.0/ -la
+total 36
+drwxr-xr-x 8 root root 4096 Oct  5 13:20  .
+drwxr-xr-x 5 root root 4096 Oct  5 13:17  ..
+drwxr-xr-x 6 root root 4096 Oct  5 13:19 'DIA SDK'
+drwxr-xr-x 2 root root 4096 Oct  5 13:20  sys32
+drwxr-xr-x 2 root root 4096 Oct  5 13:20  sys64
+drwxr-xr-x 2 root root 4096 Oct  5 13:20  sysarm64
+drwxr-xr-x 5 root root 4096 Oct  5 13:20  VC
+-rw-rw-rw- 1 root root    5 Sep 26 17:05  VS_VERSION
+drwxr-xr-x 3 root root 4096 Oct  5 13:20 'Windows Kits'
+```
+
+6. Start the runner
 ```
 cd bromite-buildtools/images/github-runner/
 ./start-runner.sh

images/bromite-build/Dockerfile

@@ -2,6 +2,11 @@ ARG BROMITE_SHA
 
 FROM uazo/bromite:$BROMITE_SHA
 
+ARG HTTP_PROXY
+ENV HTTP_PROXY=$HTTP_PROXY
+ENV HTTPS_PROXY=$HTTP_PROXY
+ENV https_proxy=$HTTP_PROXY
+
 USER lg
 WORKDIR /home/lg/working_dir
 

images/bromite-build/build_args.gni

@@ -3,46 +3,40 @@ declare_args() {
   _is_debug_build = ""
 }
 
-_is_debug_build = getenv("TARGET_ISDEBUG")
-
 not_needed(["_target_build", "_is_debug_build"])
 
 if(getenv("TARGET_CPU") != "") {
   target_cpu = getenv("TARGET_CPU")
 }
-# print("Target " + target_cpu)
 
-enable_kythe_annotations = true
-# clang_use_chrome_plugins = false
 if (target_os == "android") {
+  enable_kythe_annotations = true
   chrome_public_manifest_package = "org.bromite.bromite.dev"
-}
 
-if(_is_debug_build == "true") {
-# print("Debug build on")
-  is_debug = true
-  is_official_build = false
-  dcheck_always_on = true
-  if (target_os == "win") {
-    symbol_level = 0
-    use_large_pdbs = true
-  } else {
+  _is_debug_build = getenv("TARGET_ISDEBUG")
+  if(_is_debug_build == "true") {
+    # print("Debug build on")
+    is_debug = true
+    is_official_build = false
+    dcheck_always_on = true
     symbol_level = 1
-  }
-  strip_debug_info = false
-  generate_linker_map = false
+    strip_debug_info = false
+    generate_linker_map = false
 
-  # since is_cfi require use_thin_lto
-  # but not work in debug mode
-  is_cfi = false # disable it
-  use_cfi_cast = false # disable it
-} else {
-  if (target_os == "android") {
-    generate_linker_map = true
-  }
-
-  if (target_os == "win") {
+    # since is_cfi require use_thin_lto
+    # but not work in debug mode
     is_cfi = false # disable it
     use_cfi_cast = false # disable it
-  }  
+  } else {
+    generate_linker_map = true
+  }
+}
+
+if (target_os == "win") {
+  target_cpu = "x64"
+  symbol_level = 0
+  use_large_pdbs = true
+
+  is_cfi = false # disable it
+  use_cfi_cast = false # disable it
 }

images/bromite-source/Dockerfile

@@ -5,9 +5,18 @@ FROM uazo/chromium:$VERSION
 ARG BROMITE_SHA
 ENV BROMITE_SHA=$BROMITE_SHA
 
+ARG HTTP_PROXY
+ENV HTTP_PROXY=$HTTP_PROXY
+ENV HTTPS_PROXY=$HTTP_PROXY
+ENV https_proxy=$HTTP_PROXY
+
 #USER lg
 WORKDIR /home/lg/working_dir
 
+RUN sudo chown lg /etc/apt/apt.conf.d/proxy.conf
+RUN sudo echo "Acquire::http::Proxy \"$HTTP_PROXY\";" >/etc/apt/apt.conf.d/proxy.conf
+RUN sudo apt-get update
+
 COPY apply-bromite-patches.sh .
 
 RUN sudo chmod +x ./apply-bromite-patches.sh && \

images/build-deps/Dockerfile

@@ -16,7 +16,7 @@ RUN dpkg --add-architecture i386
 
 RUN apt-get update &&\
     DEBIAN_FRONTEND=noninteractive \
-    apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils python sed tzdata build-essential lib32gcc-9-dev g++-multilib
+    apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils python sed tzdata build-essential lib32gcc-9-dev g++-multilib dos2unix wiggle
 
 ENV user lg
 
@@ -40,5 +40,7 @@ RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/inst
     chmod +x ./install-build-deps.sh && \
     chmod +x ./install-build-deps-android.sh && \
     sudo ./install-build-deps.sh --no-prompt --lib32 --no-chromeos-fonts && \
-    sudo ./install-build-deps-android.sh --no-prompt
+    sudo ./install-build-deps-android.sh --no-prompt && \
+    sudo mkdir -p /github/home/.vscode-server && \
+    sudo chown lg /github/home/.vscode-server
 

images/github-runner/Dockerfile

@@ -109,10 +109,10 @@ RUN chmod +x ./patched/runsvc.sh /usr/local/bin/startup.sh
 
 USER runner
 
-ENV HTTP_PROXY="http://127.0.0.1:8118"
-ENV HTTPS_PROXY="http://127.0.0.1:8118"
-ENV http_proxy="http://127.0.0.1:8118"
-ENV https_proxy="http://127.0.0.1:8118"
+ENV HTTP_PROXY="http://172.18.0.1:8118"
+ENV HTTPS_PROXY="http://172.18.0.1:8118"
+ENV http_proxy="http://172.18.0.1:8118"
+ENV https_proxy="http://172.18.0.1:8118"
 COPY docker.default /etc/default/docker
 COPY proxy.conf /etc/apt/apt.conf.d/proxy.conf
 

images/github-runner/proxy.conf

@@ -1 +1 @@
-Acquire::http::Proxy "http://127.0.0.1:8118";
+Acquire::http::Proxy "http://172.18.0.1:8118";

images/image-downloader/check_and_download.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+while true
+do
+
+   VERSION=$(curl -s https://omahaproxy.appspot.com/all.json | jq '.[] | select(.os | contains("win64")) | .versions[] | select(.channel | contains("stable")) | .current_version' | xargs)
+   echo Check for $VERSION
+
+   docker -H unix:///home/$USER/gh-runner-ci/var/run/docker.sock pull uazo/build-deps:$VERSION
+   docker -H unix:///home/$USER/gh-runner-ci/var/run/docker.sock pull uazo/chromium:$VERSION
+
+   docker -H unix:///home/$USER/gh-runner/var/run/docker.sock pull uazo/build-deps:$VERSION
+   docker -H unix:///home/$USER/gh-runner/var/run/docker.sock pull uazo/chromium:$VERSION
+
+   sleep 1h
+
+done