Update release.yaml

.github/workflows/build-images.yaml

@@ -35,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

.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

@@ -79,11 +79,13 @@ jobs:
           $GH release upload $VERSION-$BROMITE_SHA $APK
           
           echo Uploading chrome.size
-          $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/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
-          cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html
-          $GH release upload $VERSION-$BROMITE_SHA 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/
@@ -119,6 +121,9 @@ jobs:
           
           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"

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";