From 146617ab0a09ba60213147b8a04a7daa07e0c358 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Tue, 9 Jan 2024 09:25:14 +0100
Subject: [PATCH 1/3] Revert "do not send builds when current build is not on
 server"

This reverts commit dbeaf9f87709f012c4d71ca655fcb9061d681154.
---
 .gitlab-ci.yml         | 2 +-
 src/Helpers/Builds.php | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90cfb07..3051ed6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php
index 0dd32d2..7749c45 100644
--- a/src/Helpers/Builds.php
+++ b/src/Helpers/Builds.php
@@ -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)) {
-- 
GitLab


From a1822bcd634d088810b654e8c9a32d81d394e9e7 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Tue, 9 Jan 2024 09:26:33 +0100
Subject: [PATCH 2/3] Fix docker build

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3051ed6..90cfb07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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_BUILD_TOKEN $CI_REGISTRY
+  - docker login -u gitlab-ci-token -p $CI_JOB_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
-- 
GitLab


From f36de81b2c5cdbfb59828d086f8da113f3a0d70d Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicolas.gelot@e.email>
Date: Tue, 9 Jan 2024 09:28:44 +0100
Subject: [PATCH 3/3] Set debug logs with right logger level

---
 src/Helpers/Builds.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php
index 7749c45..71f6446 100644
--- a/src/Helpers/Builds.php
+++ b/src/Helpers/Builds.php
@@ -67,7 +67,7 @@
             foreach ($this->builds as $build) {
                
                 if (!$build->checkVersion($this->currentBuild)) {
-                    $this->logger->info($build->getIncremental().' ignored as build version is older than current version');
+                    $this->logger->debug($build->getIncremental().' ignored as build version is older than current version');
                     continue;
                 }
                 $isUpgradeSupported = false;
@@ -75,7 +75,7 @@
                     $currentBuildVersion = $this->currentBuild->getAndroidVersion();
                     $isUpgradeSupported = $build->getIsUpgradeSupported($currentBuildVersion);
                     if (!$isUpgradeSupported) {
-                        $this->logger->info($build->getIncremental().' ignored as upgrade path is not permitted');
+                        $this->logger->debug($build->getIncremental().' ignored as upgrade path is not permitted');
                         continue;
                     }
                 }
@@ -84,7 +84,7 @@
                     continue;
                 }
                 
-                $this->logger->info($build->getIncremental().' is a new update');
+                $this->logger->debug($build->getIncremental().' is a new update');
 
                 array_push($ret, array(
                     // CyanogenMod
@@ -209,7 +209,7 @@
                     $sourceIncremental = isset($this->postData['params']['source_incremental']) ? $this->postData['params']['source_incremental'] : NULL;
                     if ($build->isValid($this->postData['params']) && $sourceIncremental && strcmp($sourceIncremental, $build->getIncremental()) === 0) {
                         $this->currentBuild = $build;
-                        $this->logger->info($build->getIncremental().' is the current build');
+                        $this->logger->debug($build->getIncremental().' is the current build');
                         if($this->currenteOSVersion === -1){
                             //get current version from build.prop
                             $this->currenteOSVersion = $this->currentBuild->getVersion();
-- 
GitLab