Compare commits
23 Commits
v106.0.524
...
v107.0.530
Author | SHA1 | Date | |
---|---|---|---|
|
ed3fb656cb | ||
|
7b14f5ba33 | ||
|
4432e3bc3b | ||
|
400575271c | ||
|
eed67c45b1 | ||
|
f6ceaa75a8 | ||
|
2976fd07ff | ||
|
a880652f08 | ||
|
ac45d8cb17 | ||
|
e22b3b9512 | ||
|
e73b4e3c55 | ||
|
fd8a710847 | ||
|
5bfbb668f4 | ||
|
8bccbc8d51 | ||
|
6a33b40dc0 | ||
|
0500a3879c | ||
|
c515d1a4dc | ||
|
a872a2dee8 | ||
|
fdff032db3 | ||
|
cf67ee0fea | ||
|
60ee49376e | ||
|
a2f4b53004 | ||
|
6ab623651a |
21
.github/workflows/build-images.yaml
vendored
21
.github/workflows/build-images.yaml
vendored
@@ -3,7 +3,7 @@ permissions:
|
|||||||
checks: none
|
checks: none
|
||||||
contents: none
|
contents: none
|
||||||
deployments: none
|
deployments: none
|
||||||
issues: none
|
issues: write
|
||||||
packages: none
|
packages: none
|
||||||
pull-requests: none
|
pull-requests: none
|
||||||
repository-projects: none
|
repository-projects: none
|
||||||
@@ -18,10 +18,11 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
default: ''
|
default: ''
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 5 * * *'
|
- cron: '0 1 * * *'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
VERSION: ${{ github.event.inputs.version }}
|
VERSION: ${{ github.event.inputs.version }}
|
||||||
|
NEW_VERSION: ${{ null }}
|
||||||
|
|
||||||
name: Builds and pushes tagged image to DockerHub
|
name: Builds and pushes tagged image to DockerHub
|
||||||
jobs:
|
jobs:
|
||||||
@@ -74,6 +75,7 @@ jobs:
|
|||||||
bromite-buildtools/images/build-deps/.
|
bromite-buildtools/images/build-deps/.
|
||||||
|
|
||||||
docker push uazo/build-deps:$VERSION
|
docker push uazo/build-deps:$VERSION
|
||||||
|
echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -91,6 +93,21 @@ jobs:
|
|||||||
bromite-buildtools/images/chr-source/.
|
bromite-buildtools/images/chr-source/.
|
||||||
|
|
||||||
docker push uazo/chromium:$VERSION
|
docker push uazo/chromium:$VERSION
|
||||||
|
echo "NEW_VERSION=$VERSION" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
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 ""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
2
.github/workflows/build_bromite_dev.yaml
vendored
2
.github/workflows/build_bromite_dev.yaml
vendored
@@ -251,7 +251,7 @@ jobs:
|
|||||||
cd $WORKSPACE/chromium/src
|
cd $WORKSPACE/chromium/src
|
||||||
|
|
||||||
echo "::group::-------- gn gen"
|
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 "::endgroup::"
|
||||||
|
|
||||||
echo "::group::-------- gn args"
|
echo "::group::-------- gn args"
|
||||||
|
90
.github/workflows/release.yaml
vendored
90
.github/workflows/release.yaml
vendored
@@ -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)
|
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
|
echo "BRANCH=$BRANCH" >> $GITHUB_ENV
|
||||||
|
|
||||||
wget https://github.com/cli/cli/releases/download/v2.4.0/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.4.0_linux_amd64.tar.gz
|
tar xfz gh_2.18.1_linux_amd64.tar.gz
|
||||||
|
|
||||||
- name: Checkout 'uazo/buildtools'
|
- name: Checkout 'uazo/buildtools'
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
@@ -49,19 +49,81 @@ jobs:
|
|||||||
path: 'bromite'
|
path: 'bromite'
|
||||||
fetch-depth: 1
|
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
|
- name: Create release
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo ${{ secrets.GITHUB_TOKEN }} | gh_2.4.0_linux_amd64/bin/gh auth login --with-token
|
GH=gh_2.18.1_linux_amd64/bin/gh
|
||||||
|
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
||||||
cd bromite
|
|
||||||
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
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
|
||||||
|
$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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
26
README.md
26
README.md
@@ -35,7 +35,31 @@ RUNNER_LABELS=dev
|
|||||||
ALLOWEDAUTHORSLIST=uazo
|
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/
|
cd bromite-buildtools/images/github-runner/
|
||||||
./start-runner.sh
|
./start-runner.sh
|
||||||
|
@@ -2,6 +2,11 @@ ARG BROMITE_SHA
|
|||||||
|
|
||||||
FROM uazo/bromite:$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
|
USER lg
|
||||||
WORKDIR /home/lg/working_dir
|
WORKDIR /home/lg/working_dir
|
||||||
|
|
||||||
|
@@ -3,46 +3,40 @@ declare_args() {
|
|||||||
_is_debug_build = ""
|
_is_debug_build = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
_is_debug_build = getenv("TARGET_ISDEBUG")
|
|
||||||
|
|
||||||
not_needed(["_target_build", "_is_debug_build"])
|
not_needed(["_target_build", "_is_debug_build"])
|
||||||
|
|
||||||
if(getenv("TARGET_CPU") != "") {
|
if(getenv("TARGET_CPU") != "") {
|
||||||
target_cpu = 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") {
|
if (target_os == "android") {
|
||||||
|
enable_kythe_annotations = true
|
||||||
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
chrome_public_manifest_package = "org.bromite.bromite.dev"
|
||||||
}
|
|
||||||
|
|
||||||
if(_is_debug_build == "true") {
|
_is_debug_build = getenv("TARGET_ISDEBUG")
|
||||||
# print("Debug build on")
|
if(_is_debug_build == "true") {
|
||||||
is_debug = true
|
# print("Debug build on")
|
||||||
is_official_build = false
|
is_debug = true
|
||||||
dcheck_always_on = true
|
is_official_build = false
|
||||||
if (target_os == "win") {
|
dcheck_always_on = true
|
||||||
symbol_level = 0
|
|
||||||
use_large_pdbs = true
|
|
||||||
} else {
|
|
||||||
symbol_level = 1
|
symbol_level = 1
|
||||||
}
|
strip_debug_info = false
|
||||||
strip_debug_info = false
|
generate_linker_map = false
|
||||||
generate_linker_map = false
|
|
||||||
|
|
||||||
# since is_cfi require use_thin_lto
|
# since is_cfi require use_thin_lto
|
||||||
# but not work in debug mode
|
# 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") {
|
|
||||||
is_cfi = false # disable it
|
is_cfi = false # disable it
|
||||||
use_cfi_cast = 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
|
||||||
}
|
}
|
||||||
|
@@ -5,9 +5,18 @@ FROM uazo/chromium:$VERSION
|
|||||||
ARG BROMITE_SHA
|
ARG BROMITE_SHA
|
||||||
ENV BROMITE_SHA=$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
|
#USER lg
|
||||||
WORKDIR /home/lg/working_dir
|
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 .
|
COPY apply-bromite-patches.sh .
|
||||||
|
|
||||||
RUN sudo chmod +x ./apply-bromite-patches.sh && \
|
RUN sudo chmod +x ./apply-bromite-patches.sh && \
|
||||||
|
17
images/image-downloader/check_and_download.sh
Normal file
17
images/image-downloader/check_and_download.sh
Normal file
@@ -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
|
Reference in New Issue
Block a user