Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 084c03e8 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Fix CI build

parent 7e5fd597

.gitlab-ci.yml

+2 −2
Original line number Original line Diff line number Diff line
@@ -11,8 +11,8 @@ build_image: 
  services:

  services:

    - docker:20.10.16-dind

    - docker:20.10.16-dind

  script:

  script:

    - "docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME || true"

    - "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"

    - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"

    - "docker pull $CI_REGISTRY_IMAGE:latest"

    - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."

    - "docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME ."

    - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"

    - "docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"

    - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi
 
    - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CI_REGISTRY_IMAGE:latest ; fi

Dockerfile

+1 −2
Original line number Original line Diff line number Diff line
@@ -70,5 +70,4 @@ RUN sdkmanager --verbose --package_file=/sdk/packages.txt 




# Download and install Gradle

# Download and install Gradle

# Keep it aligned default version as given in https://developer.android.com/studio/releases/gradle-plugin#versioning-update

# Keep it aligned default version as given in https://developer.android.com/studio/releases/gradle-plugin#versioning-update

RUN curl -s https://downloads.gradle-dn.com/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip > /gradle.zip && \

RUN wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip -O /gradle.zip && unzip /gradle.zip -d /gradle
 
    unzip -q /gradle.zip -d /gradle