diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bbbc2567..f3014ee6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -166,10 +166,10 @@ jobs: toolchain: stable 2 weeks ago - name: Build and Cache Rust Dependencies - uses: Swatinem/rust-cache@v2.9.1 + uses: Swatinem/rust-cache@v2.9.2 - name: Install Python - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: "3.12-dev" diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index d41e77e0..bcf49623 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v7 - name: Self-hosted Renovate - uses: renovatebot/github-action@v46.1.19 + uses: renovatebot/github-action@v46.2.1 with: configurationFile: .github/renovate.json5 # https://docs.renovatebot.com/modules/platform/github/#running-using-a-fine-grained-token diff --git a/.gitignore b/.gitignore index ed359f36..8959014a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ # Python virtual environment venv + +# OMO +.omo diff --git a/src/declarations.sh b/src/declarations.sh index 67f57086..f0d6bdee 100755 --- a/src/declarations.sh +++ b/src/declarations.sh @@ -28,13 +28,13 @@ USER="pixincreate" # GitHub username # Application version variables VERSION[AFSR]="${VERSION[AFSR]:-1.0.4}" VERSION[ALTERINSTALLER]="${VERSION[ALTERINSTALLER]:-2.4}" -VERSION[AVBROOT]="${VERSION[AVBROOT]:-3.31.0}" -VERSION[AVBROOT_SETUP]="e4f80bb54aa5ae8de6109edd7d0873d5b4966748" # Commit hash -VERSION[BCR]="${VERSION[BCR]:-3.4}" -VERSION[CUSTOTA]="${VERSION[CUSTOTA]:-6.2}" +VERSION[AVBROOT]="${VERSION[AVBROOT]:-3.33.0}" +VERSION[AVBROOT_SETUP]="848deb1311a72fcb9b582cef79e0be558ae64db8" # Commit hash +VERSION[BCR]="${VERSION[BCR]:-3.5}" +VERSION[CUSTOTA]="${VERSION[CUSTOTA]:-6.4}" VERSION[GRAPHENEOS]="${VERSION[GRAPHENEOS]:-}" VERSION[MAGISK]="${VERSION[MAGISK]:-}" -VERSION[MSD]="${VERSION[MSD]:-2.3}" +VERSION[MSD]="${VERSION[MSD]:-2.4}" VERSION[OEMUNLOCKONBOOT]="${VERSION[OEMUNLOCKONBOOT]:-1.4}" # Magisk diff --git a/src/util_functions.sh b/src/util_functions.sh index 301ed369..d21ef2bf 100755 --- a/src/util_functions.sh +++ b/src/util_functions.sh @@ -266,7 +266,7 @@ function env_setup() { local afsr="${WORKDIR}/tools/afsr" local custota_tool="${WORKDIR}/tools/custota-tool" local my_avbroot_setup="${WORKDIR}/tools/my-avbroot-setup" - local requirements_file="${my_avbroot_setup}/requirements.txt" + local pyproject_file="${my_avbroot_setup}/pyproject.toml" # Add the paths to the PATH environment variable just so that the script can find them if ! command -v avbroot &>/dev/null && ! command -v afsr &>/dev/null && ! command -v custota-tool &>/dev/null; then @@ -277,22 +277,16 @@ function env_setup() { enable_venv # Install required Python packages - if [[ -f "${requirements_file}" ]]; then - local missing_packages=false - while read -r package; do - [[ -z "${package}" ]] && continue - if ! pip list | grep -i "^${package%%[=><]*}" &>/dev/null; then - missing_packages=true - break - fi - done <"${requirements_file}" - - if [[ "${missing_packages}" == "true" ]]; then - echo -e "Installing required Python packages from requirements.txt..." - pip3 install -r "${requirements_file}" + if [[ -f "${pyproject_file}" ]]; then + if ! command -v uv &>/dev/null; then + echo -e "uv not found. Installing..." + python3 -m pip install uv fi + + echo -e "Installing required Python packages from pyproject.toml..." + uv pip install -r "${pyproject_file}" else - echo -e "Warning: requirements.txt not found at ${requirements_file}" + echo -e "Warning: pyproject.toml not found at ${my_avbroot_setup}" fi }