Compare commits
16 Commits
v112-try-t
...
master
Author | SHA1 | Date |
---|---|---|
uazo | 813cea7bd5 | |
uazo | 0c4f152b89 | |
uazo | 2493688ed2 | |
uazo | 2e590285d4 | |
uazo | 248956d7ab | |
Carmelo Messina | 7d8f0cc0d5 | |
uazo | 789763aa43 | |
uazo | bfc4344c08 | |
uazo | 3f88c4057b | |
uazo | af699d0a79 | |
uazo | e4d8215edc | |
uazo | 14d985bb11 | |
uazo | ec5f36abea | |
uazo | d440dfaf35 | |
Carmelo Messina | 00ea75681d | |
Carmelo Messina | 9d7d84d78f |
|
@ -23,17 +23,17 @@ on:
|
||||||
required: true
|
required: true
|
||||||
default: 'all'
|
default: 'all'
|
||||||
build:
|
build:
|
||||||
description: 'android arch [arm64/x64]'
|
description: 'android arch [arm64/x64/all]'
|
||||||
required: true
|
required: true
|
||||||
default: 'x64'
|
default: 'all'
|
||||||
type:
|
type:
|
||||||
description: 'runner? [dev/ci]'
|
description: 'runner? [dev/ci]'
|
||||||
required: true
|
required: true
|
||||||
default: 'dev'
|
default: 'ci'
|
||||||
debug:
|
debug:
|
||||||
description: 'debug? [true/false]'
|
description: 'debug? [true/false]'
|
||||||
required: true
|
required: true
|
||||||
default: 'true'
|
default: 'false'
|
||||||
clangd:
|
clangd:
|
||||||
description: 'clangd? [true/false]'
|
description: 'clangd? [true/false]'
|
||||||
required: true
|
required: true
|
||||||
|
@ -158,7 +158,7 @@ jobs:
|
||||||
runs-on: ${{ github.event.inputs.type }}
|
runs-on: ${{ github.event.inputs.type }}
|
||||||
needs: check_images
|
needs: check_images
|
||||||
if: success()
|
if: success()
|
||||||
timeout-minutes: 720
|
timeout-minutes: 1200
|
||||||
|
|
||||||
container:
|
container:
|
||||||
image: uazo/bromite-build:build
|
image: uazo/bromite-build:build
|
||||||
|
@ -177,10 +177,10 @@ jobs:
|
||||||
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
|
GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
|
||||||
# compile in debug mode
|
# compile in debug mode
|
||||||
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
|
TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
|
||||||
TARGET_CPU: ${{ github.event.inputs.build }}
|
|
||||||
TARGET_OS: ${{ github.event.inputs.target_os }}
|
TARGET_OS: ${{ github.event.inputs.target_os }}
|
||||||
volumes:
|
volumes:
|
||||||
- /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite
|
- /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/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
|
- /storage/images/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
|
||||||
- /tmp/proxy:/tmp/proxy
|
- /tmp/proxy:/tmp/proxy
|
||||||
- /win_sdk:/win_sdk
|
- /win_sdk:/win_sdk
|
||||||
|
@ -207,7 +207,11 @@ jobs:
|
||||||
test -d chromium/src/out/bromite_win || sudo mkdir -p chromium/src/out/bromite_win && \
|
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 &&
|
||||||
sudo chown lg chromium/src/out/bromite_win
|
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
|
# make kythe output directory
|
||||||
test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
|
test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
|
||||||
|
|
||||||
|
@ -216,15 +220,15 @@ jobs:
|
||||||
sudo chmod g-rxw /run/user/1000/
|
sudo chmod g-rxw /run/user/1000/
|
||||||
sudo chmod o-rxw /run/user/1000/
|
sudo chmod o-rxw /run/user/1000/
|
||||||
|
|
||||||
- name: Build Bromite Android
|
- name: Build Bromite Android arm64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
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\") $(cat ../../build_args.gni) " out/bromite
|
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm64\" " out/bromite
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
||||||
echo "::group::-------- gn args"
|
echo "::group::-------- gn args"
|
||||||
|
@ -236,14 +240,14 @@ jobs:
|
||||||
|
|
||||||
cp ../../bromite/build/RELEASE out/bromite
|
cp ../../bromite/build/RELEASE out/bromite
|
||||||
|
|
||||||
- name: Get ninja logs Android
|
- name: Get ninja logs Android arm64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
|
$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
|
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
|
||||||
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
|
@ -272,8 +276,37 @@ jobs:
|
||||||
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
$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
|
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
|
||||||
|
|
||||||
- name: Generate breakpad symbols
|
- name: Build Bromite Android x64
|
||||||
if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == '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
|
||||||
|
cd $WORKSPACE/chromium/src
|
||||||
|
|
||||||
|
echo "::group::-------- gn gen"
|
||||||
|
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite_x64
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
echo "::group::-------- gn args"
|
||||||
|
gn args out/bromite_x64/ --list --short
|
||||||
|
gn args out/bromite_x64/ --list >out/bromite_x64/gn_list
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
autoninja -C out/bromite_x64 chrome_public_apk
|
||||||
|
|
||||||
|
cp ../../bromite/build/RELEASE out/bromite_x64
|
||||||
|
|
||||||
|
- name: Get ninja logs Android x64
|
||||||
|
if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
cd $WORKSPACE
|
||||||
|
$WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_x64/.ninja_log >$WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
|
||||||
|
python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
|
||||||
|
|
||||||
|
|
||||||
|
- 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') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
|
@ -290,7 +323,7 @@ jobs:
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
||||||
- name: Generate Supersize data
|
- name: Generate Supersize data
|
||||||
if: ${{ github.event.inputs.debug == 'false' && (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') }}
|
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') }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
|
@ -299,7 +332,7 @@ jobs:
|
||||||
tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v
|
tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v
|
||||||
|
|
||||||
- name: Generate clangd index
|
- name: Generate clangd index
|
||||||
if: ${{ github.event.inputs.debug == 'true' && github.event.inputs.clangd == 'true' }}
|
if: ${{ github.event.inputs.clangd == 'true' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
|
||||||
|
@ -312,5 +345,3 @@ jobs:
|
||||||
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
|
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
|
||||||
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite/bromite.idx && \
|
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite/bromite.idx && \
|
||||||
rm -rf out/clangd
|
rm -rf out/clangd
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,6 @@ on:
|
||||||
description: 'uazo/bromite SHA'
|
description: 'uazo/bromite SHA'
|
||||||
required: true
|
required: true
|
||||||
default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
|
default: '0a8ff322d6e9d738f7b2fa52618b178081bd100d'
|
||||||
build:
|
|
||||||
description: 'arch [arm64/x64]'
|
|
||||||
required: true
|
|
||||||
default: 'arm64'
|
|
||||||
type:
|
type:
|
||||||
description: 'runner? [dev/ci]'
|
description: 'runner? [dev/ci]'
|
||||||
required: true
|
required: true
|
||||||
|
@ -22,14 +18,13 @@ env:
|
||||||
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
BROMITE_SHA: ${{ github.event.inputs.sha }}
|
||||||
REMOVEDOCKERSUPPORT: true
|
REMOVEDOCKERSUPPORT: true
|
||||||
USELOCALIMAGE: true
|
USELOCALIMAGE: true
|
||||||
GOMAJOBS: 60
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
runs-on: ${{ github.event.inputs.type }}
|
runs-on: ${{ github.event.inputs.type }}
|
||||||
env:
|
env:
|
||||||
OUTPUTFILE: /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
|
OUTPUTFILE_ARM64: /storage/images/android/${{ github.event.inputs.sha }}/false/arm64/
|
||||||
APK: ${{ github.event.inputs.build }}_ChromePublic.apk
|
OUTPUTFILE_X64: /storage/images/android/${{ github.event.inputs.sha }}/false/x64/
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Prepare container
|
- name: Prepare container
|
||||||
|
@ -54,7 +49,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
GH=gh_2.18.1_linux_amd64/bin/gh
|
GH=gh_2.18.1_linux_amd64/bin/gh
|
||||||
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
WINOUT=/storage/images/win/x64/$BROMITE_SHA/
|
||||||
VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
|
VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
|
||||||
|
|
||||||
cd bromite
|
cd bromite
|
||||||
|
|
||||||
|
@ -71,20 +66,25 @@ jobs:
|
||||||
|
|
||||||
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
$GH release create $VERSION-$BROMITE_SHA --notes-file note -d
|
||||||
|
|
||||||
# android
|
# android arm64
|
||||||
sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
|
sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk arm64_ChromePublic.apk
|
||||||
sudo chown runner ChromePublic.apk
|
sudo chown runner arm64_ChromePublic.apk
|
||||||
mv ChromePublic.apk $APK
|
echo Uploading arm64_ChromePublic
|
||||||
echo Uploading $APK
|
$GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk
|
||||||
$GH release upload $VERSION-$BROMITE_SHA $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
|
||||||
|
|
||||||
echo Uploading chrome.size
|
echo Uploading chrome.size
|
||||||
test $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size && \
|
test $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
|
||||||
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
|
$GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
|
||||||
|
|
||||||
echo Uploading arm64_ninja_log_trace.html
|
echo Uploading arm64_ninja_log_trace.html
|
||||||
test $OUTPUTFILE/ninja_log_trace.html && \
|
test $OUTPUTFILE_ARM64/ninja_log_trace.html && \
|
||||||
cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html && \
|
cp $OUTPUTFILE_ARM64/ninja_log_trace.html arm64_ninja_log_trace.html && \
|
||||||
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
|
$GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
|
||||||
|
|
||||||
# windows
|
# windows
|
||||||
|
@ -98,7 +98,7 @@ jobs:
|
||||||
cp $WINOUT/chrome_proxy.exe chrome-win/
|
cp $WINOUT/chrome_proxy.exe chrome-win/
|
||||||
cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
|
cp $WINOUT/chrome_pwa_launcher.exe chrome-win/
|
||||||
cp $WINOUT/chrome_wer.dll 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 "/win_sdk/10.0.22621.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
|
||||||
cp $WINOUT/elevation_service.exe chrome-win/
|
cp $WINOUT/elevation_service.exe chrome-win/
|
||||||
cp "$WINOUT/First Run" chrome-win/
|
cp "$WINOUT/First Run" chrome-win/
|
||||||
cp $WINOUT/headless_lib_data.pak chrome-win/
|
cp $WINOUT/headless_lib_data.pak chrome-win/
|
||||||
|
@ -132,4 +132,4 @@ jobs:
|
||||||
|
|
||||||
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
$GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
|
||||||
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
$GH release edit $VERSION-$BROMITE_SHA --draft=false
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ RUN apt-get update && \
|
||||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
|
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
|
||||||
apt-key fingerprint 0EBFCD88 && \
|
apt-key fingerprint 0EBFCD88 && \
|
||||||
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
|
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
|
||||||
apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli containerd.io=1.4.4-1 && \
|
apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli && \
|
||||||
apt-get clean -y && \
|
apt-get clean -y && \
|
||||||
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
|
rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
|
||||||
/usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
|
/usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
|
||||||
|
@ -77,7 +77,7 @@ RUN useradd -m runner \
|
||||||
|
|
||||||
# Build args
|
# Build args
|
||||||
ARG TARGETPLATFORM=amd64
|
ARG TARGETPLATFORM=amd64
|
||||||
ARG RUNNER_VERSION=2.302.5
|
ARG RUNNER_VERSION=2.303.1
|
||||||
WORKDIR /runner
|
WORKDIR /runner
|
||||||
|
|
||||||
# Runner download supports amd64 as x64
|
# Runner download supports amd64 as x64
|
||||||
|
@ -109,10 +109,15 @@ RUN chmod +x ./patched/runsvc.sh /usr/local/bin/startup.sh
|
||||||
|
|
||||||
USER runner
|
USER runner
|
||||||
|
|
||||||
ENV HTTP_PROXY="http://172.18.0.1:8118"
|
RUN wget https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64 && \
|
||||||
ENV HTTPS_PROXY="http://172.18.0.1:8118"
|
mkdir -p /home/runner/.docker/cli-plugins && \
|
||||||
ENV http_proxy="http://172.18.0.1:8118"
|
mv buildx-v0.10.4.linux-amd64 /home/runner/.docker/cli-plugins/docker-buildx && \
|
||||||
ENV https_proxy="http://172.18.0.1:8118"
|
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"
|
||||||
COPY docker.default /etc/default/docker
|
COPY docker.default /etc/default/docker
|
||||||
COPY proxy.conf /etc/apt/apt.conf.d/proxy.conf
|
COPY proxy.conf /etc/apt/apt.conf.d/proxy.conf
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Acquire::http::Proxy "http://172.18.0.1:8118";
|
Acquire::http::Proxy "http://127.0.0.1:8118";
|
||||||
|
|
|
@ -40,7 +40,7 @@ do
|
||||||
-v /casefold:/win_sdk \
|
-v /casefold:/win_sdk \
|
||||||
--network none \
|
--network none \
|
||||||
--device=/dev/kvm \
|
--device=/dev/kvm \
|
||||||
uazo/github-runner
|
uazo/github-runner:2.303.2
|
||||||
|
|
||||||
echo "You can stop now"
|
echo "You can stop now"
|
||||||
sleep 5s
|
sleep 5s
|
||||||
|
|
Loading…
Reference in New Issue