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

Commit 6bbdd5f9 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'master' into 'performance-improvements' 

# Conflicts:
#   src/Helpers/Builds.php
parents f775adc1 451ea3ab

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -12,15 +12,6 @@ variables: 
services:

- docker:19.03.1-dind



before_script:

- 'which ssh-agent || ( apk --update add openssh-client )'

- eval $(ssh-agent -s)

- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

- mkdir -p ~/.ssh

- chmod 700 ~/.ssh

- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts

- chmod 644 ~/.ssh/known_hosts



build:

  stage: build

  script:
@@ -29,11 +20,20 @@ build: 
  - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME .

  - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME

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

  tags:

    - generic_privileged



publish:

  only:

  - /^master/

  script:

  - 'which ssh-agent || ( apk --update add openssh-client )'

  - eval $(ssh-agent -s)

  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

  - mkdir -p ~/.ssh

  - chmod 700 ~/.ssh

  - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts

  - chmod 644 ~/.ssh/known_hosts

  - ssh -2 $PUBLISH_USER@$PUBLISH_URL "docker pull $CONTAINER_IMAGE:latest"

  - ssh -2 $PUBLISH_USER@$PUBLISH_URL 'cd /mnt/docker/compose-ota-images-apk/ && docker-compose up -d'

  - ssh -2 $PUBLISH_USER@$PUBLISH_URL 'docker restart nginx'

src/Helpers/Builds.php

+21 −7
Original line number Diff line number Diff line
@@ -67,8 +67,11 @@ 
                  continue;

                }



                  $this->logger->info($build->getIncremental().' is a new update');

                if ( preg_match("/disabled/i", $build->getFilename()) ) {

                  continue;

                }

                

                $this->logger->info($build->getIncremental().' is a new update');



                array_push( $ret, array(

                    // CyanogenMod
@@ -155,6 +158,17 @@ 
                $files = scandir( $dir );

                if ( count( $files ) > 0  ) {

                    foreach ( $files as $file ) {



                        $filename = pathinfo($file, PATHINFO_FILENAME);



                        if ( preg_match("/IMG/i", $filename) ) {

                          continue;

                        }

                        

                        if ( preg_match("/latest/i", $filename) ) {

                          continue;

                        }



                        $extension = pathinfo($file, PATHINFO_EXTENSION);



                        if ( $extension == 'zip' ) {