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

Verified Commit 146617ab authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Revert "do not send builds when current build is not on server" 

This reverts commit dbeaf9f8.
parent 31b8dca3

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ build: 
    - docker:19.03.1-dind

  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 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

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

src/Helpers/Builds.php

+0 −5
Original line number Diff line number Diff line
@@ -64,11 +64,6 @@ 
        {

            $ret = array();



            if(is_null($this->currentBuild)){

                $this->logger->info("Unable to find current build on server, returning empty array");

                return $ret;

            }



            foreach ($this->builds as $build) {

               

                if (!$build->checkVersion($this->currentBuild)) {