Merge branch '3595-master-a16' into 'master' (3a5c3748) · Commits · e / os / docker-lineage-cicd

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ variables:
		stage: build
		image: docker:git
		services:
		- docker:20.10.16-dind
		- docker:28.4.0-dind
		script:
		- "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
		- "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG \|\| true"

Dockerfile

+18 −19

Original line number	Diff line number	Diff line
		FROM ubuntu:20.04
		FROM ubuntu:24.04
		MAINTAINER Romain Hunault <romain.hunault@e.email>

		# Environment variables
		@@ -46,6 +46,10 @@ ENV RELEASE_TYPE 'UNOFFICIAL'

		# Repo use for build
		ENV REPO 'https://gitlab.e.foundation/e/os/android.git'
		ENV LINEAGE_REPO 'https://github.com/LineageOS/android.git'

		# If we have a change ref for lineage like refs/changes/42/436442/31
		ENV CHANGE_REF=''

		# Optional parameter to repo init --depth N
		# A size of 0 deactivates --depth N
		@@ -67,6 +71,9 @@ ENV CLEAN_OUTDIR false
		# For example, '0 10 * * *' means 'Every day at 10:00 UTC'
		ENV CRONTAB_TIME 'now'

		# Clean source code before build
		ENV CLEAN_SRC_BUILD false

		# Clean artifacts output after each build
		ENV CLEAN_AFTER_BUILD true

		@@ -145,6 +152,8 @@ ENV BUILD_FLASH_PACKAGE false
		# specify a custom manifest URL
		ENV REPO_CUSTOM_MANIFEST false

		# Build lineage from source
		ENV IS_LINEAGE_BUILD false

		# You can optionally specify a USERSCRIPTS_DIR volume containing these scripts:
		# * begin.sh, run at the very beginning
		@@ -185,29 +194,19 @@ RUN mkdir -p $USERSCRIPTS_DIR
		RUN apt-get -qq update
		RUN apt-get -qqy upgrade

		RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \
		curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick img2simg kmod jq \
		lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \
		libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \
		libxml2-utils lsof lzop maven openjdk-8-jdk pngcrush \
		procps python python3 rsync schedtool simg2img squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
		RUN apt-get install -y android-sdk-libsparse-utils bc bison bsdmainutils build-essential ccache cgpt clang cron \
		curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod jq \
		lib32readline-dev lib32z1-dev liblz4-tool \
		libsdl1.2-dev libssl-dev libxml2 \
		libxml2-utils lsof lzop maven pngcrush \
		procps python3 python-is-python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
		zip zlib1g-dev

		RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
		RUN chmod a+x /usr/local/bin/repo
		RUN ln -fs /usr/bin/python3 /usr/bin/python

		# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
		RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public \| apt-key add -
		RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
		RUN apt-get -qq update && apt-get install -y temurin-8-jdk
		RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java


		# Fix jack server SSL issue during build for openjdk (adoptopenjdk won't work for nougat and oreo)
		RUN perl -0777 -i -p -e 's/(jdk.tls.disabledAlgorithms=.*?), TLSv1, TLSv1\.1/$1/g' \
		/etc/java-8-openjdk/security/java.security

		RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2_amd64.deb && dpkg -i libtinfo5_6.3-2_amd64.deb && rm -f libtinfo5_6.3-2_amd64.deb
		RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.3-2_amd64.deb && dpkg -i libncurses5_6.3-2_amd64.deb && rm -f libncurses5_6.3-2_amd64.deb

		# Set the work directory
		########################

Dockerfile.community

+7 −11

Original line number	Diff line number	Diff line
		FROM ubuntu:20.04
		FROM ubuntu:24.04
		MAINTAINER Romain Hunault <romain.hunault@e.email>

		# Environment variables
		@@ -177,23 +177,19 @@ RUN mkdir -p $USERSCRIPTS_DIR
		RUN apt-get -qq update
		RUN apt-get -qqy upgrade

		RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang cron \
		RUN apt-get install -y android-sdk-libsparse-utils bc bison bsdmainutils build-essential ccache cgpt clang cron \
		curl flex g++-multilib gcc-multilib git git-lfs gnupg gperf imagemagick kmod jq \
		lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \
		libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \
		lib32readline-dev lib32z1-dev liblz4-tool \
		libsdl1.2-dev libssl-dev libxml2 \
		libxml2-utils lsof lzop maven pngcrush \
		procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
		procps python3 python-is-python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \
		zip zlib1g-dev

		RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo
		RUN chmod a+x /usr/local/bin/repo
		RUN ln -fs /usr/bin/python3 /usr/bin/python

		# Use adoptopenjdk.net to be able to use OpeJDK8 on debian:buster
		RUN curl -q https://packages.adoptium.net/artifactory/api/gpg/key/public \| apt-key add -
		RUN add-apt-repository --yes https://packages.adoptium.net/artifactory/deb
		RUN apt-get -qq update && apt-get install -y temurin-8-jdk
		RUN update-alternatives --set java /usr/lib/jvm/temurin-8-jdk-amd64/bin/java
		RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2_amd64.deb && dpkg -i libtinfo5_6.3-2_amd64.deb && rm -f libtinfo5_6.3-2_amd64.deb
		RUN wget https://archive.ubuntu.com/ubuntu/pool/universe/n/ncurses/libncurses5_6.3-2_amd64.deb && dpkg -i libncurses5_6.3-2_amd64.deb && rm -f libncurses5_6.3-2_amd64.deb

		# Set the work directory
		########################

build-community.sh

+3 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,9 @@ for branch in ${BRANCH_NAME//,/ }; do
		elif [[ "${BRANCH_NAME}" =~ $regex_part1"a15"$regex_part2 \|\| "${BRANCH_NAME}" =~ "a15" ]]; then
		themuppets_branch="lineage-22.2"
		android_version="15"
		elif [[ "${BRANCH_NAME}" =~ $regex_part1"a16"$regex_part2 \|\| "${BRANCH_NAME}" =~ "a16" ]]; then
		themuppets_branch="lineage-23.0"
		android_version="16"
		else
		echo ">> [$(date)] Building branch $branch is not (yet) suppported"
		exit 1

src/apex.list

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,8 +5,10 @@ com.android.appsearch
		com.android.appsearch.apk
		com.android.art
		com.android.bluetooth
		com.android.bt
		com.android.btservices
		com.android.cellbroadcast
		com.android.crashrecovery
		com.android.compos
		com.android.configinfrastructure
		com.android.connectivity.resources
		@@ -48,6 +50,7 @@ com.android.telephony
		com.android.telephonymodules
		com.android.tethering
		com.android.tzdata
		com.android.uprobestats
		com.android.uwb
		com.android.uwb.resources
		com.android.virt