CLI-1392: Redundant version notifications (#1795)

* CLI-1392: Redundant version notifications * fix release version * fix tests
acquia · Sep 9, 2024 · 81703a7 · 81703a7
1 parent 97e4559
commit 81703a7
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 140 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
           if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then
             echo "ACLI_VERSION=$GITHUB_REF_NAME" >> $GITHUB_OUTPUT
           else
-            echo "ACLI_VERSION=$GITHUB_SHA" >> $GITHUB_OUTPUT
+            echo "ACLI_VERSION=dev-$GITHUB_REF_NAME" >> $GITHUB_OUTPUT
           fi
       - name: 'Create env file'
         run: |

diff --git a/bin/acli b/bin/acli
@@ -80,7 +80,7 @@ if (in_array($input->getFirstArgument(), ['clear-kernel-cache', 'ckc'])) {
 
 putenv('BUGSNAG_KEY=');
 putenv('AMPLITUDE_KEY=');
-putenv('ACLI_VERSION=UNKNOWN');
+putenv('ACLI_VERSION=dev-unknown');
 $dotenv = Dotenv::createUnsafeMutable(__DIR__ . '/..');
 $dotenv->safeLoad();
 

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "acquia/drupal-environment-detector": "^1.2.0",
         "bugsnag/bugsnag": "^3.0",
         "composer/semver": "^3.3",
-        "consolidation/self-update": "3.0.0-alpha1 as 2.1.0",
+        "consolidation/self-update": "3.0.0-alpha2 as 2.1.0",
         "dflydev/dot-access-data": "^3",
         "grasmash/expander": "^3",
         "guzzlehttp/guzzle": "^7.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/CommandBase.php b/src/Command/CommandBase.php
@@ -1197,7 +1197,7 @@ public function checkForNewVersion(): bool|string
         if (AcquiaDrupalEnvironmentDetector::isAhIdeEnv()) {
             return false;
         }
-        if ($this->getApplication()->getVersion() === 'UNKNOWN') {
+        if ($this->getApplication()->getVersion() === 'dev-unknown') {
             return false;
         }
         try {

diff --git a/tests/phpunit/src/Application/KernelTest.php b/tests/phpunit/src/Application/KernelTest.php
@@ -26,7 +26,7 @@ public function testRun(): void
     private function getStart(): string
     {
         return <<<EOD
-Acquia CLI
+Acquia CLI dev-unknown
 
 Usage:
   command [options] [arguments]

diff --git a/tests/phpunit/src/ApplicationTestBase.php b/tests/phpunit/src/ApplicationTestBase.php
@@ -36,7 +36,7 @@ public function setUp(): void
     protected function runApp(): string
     {
         putenv("ACLI_REPO_ROOT=" . $this->projectDir);
-        putenv("ACLI_VERSION=" . 'UNKNOWN');
+        putenv("ACLI_VERSION=" . 'dev-unknown');
         $input = $this->kernel->getContainer()->get(InputInterface::class);
         $output = $this->kernel->getContainer()->get(OutputInterface::class);
         /** @var Application $application */

diff --git a/tests/phpunit/src/TestBase.php b/tests/phpunit/src/TestBase.php
@@ -178,7 +178,9 @@ protected function setUp(): void
         $this->consoleOutput = new ConsoleOutput();
         $this->setClientProphecies();
         $this->setIo();
-        $this->selfUpdateManager = $this->prophet->prophesize(SelfUpdateManager::class)->reveal();
+        $selfUpdateManagerProphecy = $this->prophet->prophesize(SelfUpdateManager::class);
+        $selfUpdateManagerProphecy->isUpToDate()->willReturn(true);
+        $this->selfUpdateManager = $selfUpdateManagerProphecy->reveal();
 
         $this->vfsRoot = vfsStream::setup();
         $this->projectDir = vfsStream::newDirectory('project')