diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dbb7bb80..d148fd99 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,6 +27,12 @@ jobs: OUTPUTFILE_X64: /storage/images/${{ github.event.inputs.sha }}/android/false/x64/ steps: + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Prepare container run: | wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip @@ -154,4 +160,7 @@ jobs: $GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA $GH release edit $VERSION-$BROMITE_SHA --draft=false - + + docker push uazo/cromite:$VERSION-$BROMITE_SHA + docker push uazo/cromite-build:$VERSION-$BROMITE_SHA + diff --git a/tools/images/bromite-build/pre-start.sh b/tools/images/bromite-build/pre-start.sh index 1ad6c15e..1cce6b97 100644 --- a/tools/images/bromite-build/pre-start.sh +++ b/tools/images/bromite-build/pre-start.sh @@ -34,7 +34,7 @@ vpython -vpython-spec .vpython -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-l vpython3 -vpython-spec .vpython3 -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-log-level debug -vpython-tool install echo -e ${RED} -------- download pgo profiles ${NC} -tools/update_pgo_profiles.py --target=win64 update --gs-url-base=chromium-optimization-profiles/pgo_profiles +python3 tools/update_pgo_profiles.py --target=win64 update --gs-url-base=chromium-optimization-profiles/pgo_profiles echo -e ${RED} -------- download x86_64 android image ${NC} #echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64 Ur_zl6_BRKRkf_9X3SMZ3eH2auoOyJ2kLslpTZZwi3gC" | .cipd_client ensure -ensure-file - -root $WORKSPACE/chromium/src/.android @@ -51,13 +51,14 @@ tar xfz kythe-v0.0.55.tar.gz # removed since fail download with # https://commondatastorage.9oo91eapis.qjz9zk/chromium-browser-clang/Linux_x64/translation_unit-llvmorg-14-init-5759-g02895eed-1.tgz -python tools/clang/scripts/update.py --package=translation_unit +cd $WORKSPACE/chromium/src +python3 tools/clang/scripts/update.py --package=translation_unit -echo -e ${RED} -------- compile modified ninja ${NC} +echo -e ${RED} -------- build modified ninja ${NC} cd $WORKSPACE/ git clone https://github.com/ninja-build/ninja.git -b v1.8.2 cd ninja -git apply $WORKSPACE/bromite-buildtools/ninja-one-target-for-compdb.patch +git apply $WORKSPACE/bromite/tools/ninja-one-target-for-compdb.patch CXX=clang++ ./configure.py --bootstrap echo -e ${RED} -------- download clang indexer ${NC} @@ -68,11 +69,11 @@ rm clangd_indexing_tools-linux-snapshot_20211205.zip echo -e ${RED} -------- download rc ${NC} cd $WORKSPACE/chromium/src -third_party/depot_tools/download_from_google_storage.py \ - --no_resume --no_auth \ - --bucket chromium-browser-clang/rc \ - -s build/toolchain/win/rc/linux64/rc.sha1 +python3 third_party/depot_tools/download_from_google_storage.py \ + --no_resume --no_auth \ + --bucket chromium-browser-clang/rc \ + -s build/toolchain/win/rc/linux64/rc.sha1 echo -e ${RED} -------- download win clang prebuilds ${NC} cd $WORKSPACE/chromium/src -tools/clang/scripts/update.py --package=clang --host-os=win --no-clear=true \ No newline at end of file +python3 tools/clang/scripts/update.py --package=clang --host-os=win --no-clear=true