Update build_bromite_dev.yaml

.github/workflows/build_bromite_dev.yaml

@@ -158,7 +158,7 @@ jobs:
     runs-on: ${{ github.event.inputs.type }}
     needs: check_images
     if: success()
-    timeout-minutes: 1200
+    timeout-minutes: 720
   
     container:
       image: uazo/bromite-build:build
@@ -179,8 +179,8 @@ jobs:
         TARGET_ISDEBUG: ${{ github.event.inputs.debug }} 
         TARGET_OS: ${{ github.event.inputs.target_os }}
       volumes:
-        - /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite
-        - /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/bromite_x64
+        - /storage/images/android/arm64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite
+        - /storage/images/android/x64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_x64
         - /storage/images/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
         - /tmp/proxy:/tmp/proxy
         - /win_sdk:/win_sdk
@@ -207,11 +207,7 @@ jobs:
           test -d chromium/src/out/bromite_win || sudo mkdir -p chromium/src/out/bromite_win && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/bromite_win
-
-          test -d chromium/src/out/bromite_x64 || sudo mkdir -p chromium/src/out/bromite_x64 && \
-            sudo chown lg chromium/src/out &&
-            sudo chown lg chromium/src/out/bromite_x64
-            
+          
           # make kythe output directory
           test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
 
@@ -306,7 +302,7 @@ jobs:
 
           
       - name: Generate breakpad symbols arm64
-        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
+        if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
         shell: bash
         run: |
           PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
@@ -323,7 +319,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Generate Supersize data
-        if: ${{ github.event.inputs.debug == 'false' && (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
+        if: ${{ github.event.inputs.debug == 'false' && (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') }}
         shell: bash
         run: |
           PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
@@ -332,7 +328,7 @@ jobs:
           tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v
       
       - name: Generate clangd index
-        if: ${{ github.event.inputs.clangd == 'true' }}
+        if: ${{ github.event.inputs.debug == 'true' && github.event.inputs.clangd == 'true' }}
         shell: bash
         run: |
           PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH

.github/workflows/release.yaml

@@ -9,6 +9,10 @@ on:
         description: 'uazo/bromite SHA'
         required: true
         default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
+      build:
+        description: 'arch [arm64/x64]'
+        required: true
+        default: 'arm64'
       type:
         description: 'runner? [dev/ci]'
         required: true
@@ -18,13 +22,14 @@ env:
   BROMITE_SHA: ${{ github.event.inputs.sha }}
   REMOVEDOCKERSUPPORT: true
   USELOCALIMAGE: true
+  GOMAJOBS: 60
   
 jobs:
   release:
     runs-on: ${{ github.event.inputs.type }}
     env:
-      OUTPUTFILE_ARM64: /storage/images/android/${{ github.event.inputs.sha }}/false/arm64/
-      OUTPUTFILE_X64: /storage/images/android/${{ github.event.inputs.sha }}/false/x64/
+      OUTPUTFILE_ARM64: /storage/images/android/arm64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
+      APK: ${{ github.event.inputs.build }}_ChromePublic.apk
         
     steps:
       - name: Prepare container
@@ -49,7 +54,7 @@ jobs:
         run: |
           GH=gh_2.18.1_linux_amd64/bin/gh
           WINOUT=/storage/images/win/x64/$BROMITE_SHA/
-          VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
+          VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)-${{ github.event.inputs.build }}
 
           cd bromite
 
@@ -66,18 +71,13 @@ jobs:
 
           $GH release create $VERSION-$BROMITE_SHA --notes-file note -d
 
-          # android arm64
-          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk arm64_ChromePublic.apk
-          sudo chown runner arm64_ChromePublic.apk
-          echo Uploading arm64_ChromePublic
-          $GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk
-
-          # android x64
-          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/ChromePublic.apk x64_ChromePublic.apk
-          sudo chown runner x64_ChromePublic.apk
-          echo Uploading x64_ChromePublic
-          $GH release upload $VERSION-$BROMITE_SHA x64_ChromePublic.apk
-
+          # android
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/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_ARM64/chrome.size && \
             $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
@@ -98,7 +98,7 @@ jobs:
           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.22621.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.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/

images/github-runner/Dockerfile

@@ -109,15 +109,10 @@ RUN chmod +x ./patched/runsvc.sh /usr/local/bin/startup.sh
 
 USER runner
 
-RUN wget https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64 && \
-    mkdir -p /home/runner/.docker/cli-plugins && \
-    mv buildx-v0.10.4.linux-amd64 /home/runner/.docker/cli-plugins/docker-buildx && \
-    chmod +x /home/runner/.docker/cli-plugins/docker-buildx
-
-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/github-runner/start-runner.sh

@@ -40,7 +40,7 @@ do
     -v /casefold:/win_sdk \
     --network none \
     --device=/dev/kvm \
-    uazo/github-runner:2.303.2
+    uazo/github-runner:2.303.1
 
   echo "You can stop now"
   sleep 5s