Loading .gitlab-ci.yml +3 −4 Original line number Original line Diff line number Diff line stages: stages: - prepare - prepare - build-arm64 - build - build-x64 variables: variables: CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH Loading @@ -28,7 +27,7 @@ build-docker: - build-browser - build-browser build-bromite-arm64: build-bromite-arm64: stage: build-arm64 stage: build extends: .build-bromite extends: .build-bromite script: script: - $CI_PROJECT_DIR/build.sh -c -s -a arm64 - $CI_PROJECT_DIR/build.sh -c -s -a arm64 Loading @@ -38,7 +37,7 @@ build-bromite-arm64: - apks/arm64/* - apks/arm64/* build-bromite-x64: build-bromite-x64: stage: build-x64 stage: build extends: .build-bromite extends: .build-bromite script: script: - $CI_PROJECT_DIR/build.sh -c -s -a x64 - $CI_PROJECT_DIR/build.sh -c -s -a x64 Loading build.sh +1 −4 Original line number Original line Diff line number Diff line Loading @@ -29,10 +29,7 @@ build() { apks="TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432" apks="TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432" mkdir -p "${root_dir}/apks/${1}" mkdir -p "${root_dir}/apks/${1}" if [ "$1" != "x64" ]; then gn gen "out/$1" --args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" " extra_arg="is_cfi=true" fi gn gen "out/$1" --args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" $extra_arg" ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk Loading Loading
.gitlab-ci.yml +3 −4 Original line number Original line Diff line number Diff line stages: stages: - prepare - prepare - build-arm64 - build - build-x64 variables: variables: CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH CONTAINER_IMAGE: registry.gitlab.e.foundation:5000/$CI_PROJECT_PATH Loading @@ -28,7 +27,7 @@ build-docker: - build-browser - build-browser build-bromite-arm64: build-bromite-arm64: stage: build-arm64 stage: build extends: .build-bromite extends: .build-bromite script: script: - $CI_PROJECT_DIR/build.sh -c -s -a arm64 - $CI_PROJECT_DIR/build.sh -c -s -a arm64 Loading @@ -38,7 +37,7 @@ build-bromite-arm64: - apks/arm64/* - apks/arm64/* build-bromite-x64: build-bromite-x64: stage: build-x64 stage: build extends: .build-bromite extends: .build-bromite script: script: - $CI_PROJECT_DIR/build.sh -c -s -a x64 - $CI_PROJECT_DIR/build.sh -c -s -a x64 Loading
build.sh +1 −4 Original line number Original line Diff line number Diff line Loading @@ -29,10 +29,7 @@ build() { apks="TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432" apks="TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432" mkdir -p "${root_dir}/apks/${1}" mkdir -p "${root_dir}/apks/${1}" if [ "$1" != "x64" ]; then gn gen "out/$1" --args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" " extra_arg="is_cfi=true" fi gn gen "out/$1" --args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" $extra_arg" ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \ trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk Loading