Added OS version for metrics (#378)

semaphoreci · Dec 13, 2022 · 776d601 · 776d601
1 parent ff81dd1
commit 776d601
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/sem-version b/sem-version
@@ -43,9 +43,9 @@ version::change() {
 version::change_ruby() {
   [[ "$software_version" == "2.5" ]] && software_version="2.5.9"
   [[ "$software_version" == "2.6" ]] && software_version="2.6.10"
-  [[ "$software_version" == "2.7" ]] && software_version="2.7.6"
-  [[ "$software_version" == "3.0" ]] && software_version="3.0.4"
-  [[ "$software_version" == "3.1" ]] && software_version="3.1.2"
+  [[ "$software_version" == "2.7" ]] && software_version="2.7.7"
+  [[ "$software_version" == "3.0" ]] && software_version="3.0.5"
+  [[ "$software_version" == "3.1" ]] && software_version="3.1.3"
 
   if ! [ -d ~/.rbenv/versions/"${software_version}" ]; then
     sem-install ruby "${software_version}"
@@ -89,9 +89,9 @@ version::change_php() {
   [[ "$software_version" == "7.1" ]] && software_version="7.1.33"
   [[ "$software_version" == "7.2" ]] && software_version="7.2.34"
   [[ "$software_version" == "7.3" ]] && software_version="7.3.33"
-  [[ "$software_version" == "7.4" ]] && software_version="7.4.32"
-  [[ "$software_version" == "8" ]] && software_version="8.0.24"
-  [[ "$software_version" == "8.0" ]] && software_version="8.0.24"
+  [[ "$software_version" == "7.4" ]] && software_version="7.4.33"
+  [[ "$software_version" == "8" ]] && software_version="8.0.26"
+  [[ "$software_version" == "8.0" ]] && software_version="8.0.26"
 
   if ! [ -d ~/.phpbrew/php/php-"${software_version}" ]; then
     sem-install php "${software_version}"
@@ -242,8 +242,8 @@ version::main() {
   software_version=$2
   force=${3:-""}
   ignore=${4:-""}
-  [ "$(uname)" == "Linux" ] && os_version="ubuntu$(lsb_release -rs)"
-  [ "$(uname)" == "Darwin" ] && os_version="macos$(sw_vers -productVersion)"
+  [ "$(uname)" == "Linux" ] && os_version="$(lsb_release -rs)"
+  [ "$(uname)" == "Darwin" ] && os_version="$(sw_vers -productVersion)"
 
   if [[ "$force" == "-i" ]] || [[ "$force" == "--ignore" ]]; then
     ignore="--ignore"

diff --git a/tests/sem_version_bionic/php.bats b/tests/sem_version_bionic/php.bats
@@ -50,45 +50,45 @@ setup() {
   assert_line --partial "imap"
 }
 
-@test "change php to 7.4.32" {
+@test "change php to 7.4.33" {
 
-  run sem-version php 7.4.32
+  run sem-version php 7.4.33
   assert_success
   source ~/.phpbrew/bashrc
   run php -v
-  assert_line --partial "PHP 7.4.32"
+  assert_line --partial "PHP 7.4.33"
   run php -m 
   assert_line --partial "magick"
   assert_line --partial "gd"
   assert_line --partial "imap"
 }
 
-@test "change php to 8.0.24" {
+@test "change php to 8.0.26" {
 
-  run sem-version php 8.0.24
+  run sem-version php 8.0.26
   assert_success
   source ~/.phpbrew/bashrc
   run php -v
-  assert_line --partial "PHP 8.0.24"
+  assert_line --partial "PHP 8.0.26"
   run php -m 
   assert_line --partial "gd"
   assert_line --partial "imap"
 }
 
-@test "php check composer 8.0.24" {
+@test "php check composer 8.0.26" {
 
   run which composer
   assert_success
   source ~/.phpbrew/bashrc
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
 }
 
-@test "php check source 8.0.24" {
+@test "php check source 8.0.26" {
 
-  run sem-version php 8.0.24
+  run sem-version php 8.0.26
   assert_success
   source ~/.phpbrew/bashrc
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
   run phpbrew ext install iconv
   assert_success
 }
diff --git a/tests/sem_version_bionic/ruby.bats b/tests/sem_version_bionic/ruby.bats
@@ -75,17 +75,17 @@ setup() {
   run sem-version ruby 2.7
   assert_success
   run ruby --version
-  assert_line --partial "ruby 2.7.6"
+  assert_line --partial "ruby 2.7.7"
 
   run sem-version ruby 3.0
   assert_success
   run ruby --version
-  assert_line --partial "ruby 3.0.4"
+  assert_line --partial "ruby 3.0.5"
 
   run sem-version ruby 3.1
   assert_success
   run ruby --version
-  assert_line --partial "ruby 3.1.2"
+  assert_line --partial "ruby 3.1.3"
 }
 
 @test "change ruby to 4.0.1" {

diff --git a/tests/sem_version_focal/php.bats b/tests/sem_version_focal/php.bats
@@ -26,60 +26,60 @@ setup() {
 # PHP
 
 
-@test "change php to 7.4.32" {
+@test "change php to 7.4.33" {
 
-  run sem-version php 7.4.32
+  run sem-version php 7.4.33
   assert_success
   source ~/.phpbrew/bashrc
   run php -v
-  assert_line --partial "PHP 7.4.32"
+  assert_line --partial "PHP 7.4.33"
   run php -m 
   assert_line --partial "magick"
   assert_line --partial "gd"
   assert_line --partial "imap"
 }
 
-@test "change php to 8.0.24" {
+@test "change php to 8.0.26" {
 
-  run sem-version php 8.0.24
+  run sem-version php 8.0.26
   assert_success
   source ~/.phpbrew/bashrc
   run php -v
-  assert_line --partial "PHP 8.0.24"
+  assert_line --partial "PHP 8.0.26"
   run php -m 
   assert_line --partial "gd"
   assert_line --partial "imap"
 }
 
-@test "php check composer 8.0.24" {
+@test "php check composer 8.0.26" {
 
   run which composer
   assert_success
   source ~/.phpbrew/bashrc
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
 }
 
-@test "php check 8.0.24" {
+@test "php check 8.0.26" {
 
-  run sem-version php 8.0.24
+  run sem-version php 8.0.26
   assert_success
   source ~/.phpbrew/bashrc
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
   run phpbrew ext install iconv
   assert_success
 }
 
-@test "php check sources 8.0.24" {
+@test "php check sources 8.0.26" {
 
-  run sem-version php 8.0.24
+  run sem-version php 8.0.26
   assert_success
   source ~/.phpbrew/bashrc
 
   run ls -lah ~/.phpbrew/distfiles/
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
 
   run ls -lah ~/.phpbrew/build/
-  assert_line --partial "8.0.24"
+  assert_line --partial "8.0.26"
 
   run phpbrew ext install iconv
   assert_success