From 11000866ac6547999033d615de1c5de9a6fe66ad Mon Sep 17 00:00:00 2001 From: schuemie Date: Fri, 23 Aug 2024 08:16:33 +0200 Subject: [PATCH] Updating compare_versions --- compare_versions | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/compare_versions b/compare_versions index 75f6e23..54e5fea 100644 --- a/compare_versions +++ b/compare_versions @@ -9,8 +9,6 @@ $r_major = $1; $r_minor = $2; $r_mod = $3; -print "New R version: $r_major-$r_minor-$r_mod\n"; - open(GIT_VERSION, "git describe --tags |"); $git = ; close(GIT_VERSION); @@ -20,33 +18,10 @@ $git_major = $1; $git_minor = $2; $git_mod = $3; -print "Current git version: $git_major-$git_minor-$git_mod\n"; - if ($r_major > $git_major || $r_minor > $git_minor || $r_mod > $git_mod) { - $monotonic = 0; + $new_version = "v$r_major.$r_minor.$r_mod"; } else { - $monotonic = -1; -} - -if ($monotonic != 0) { - print "Non-monotonically increasing versions numbers\n"; -} - -if ($monotonic == 0 & $ARGV[0] eq "--tag") { - - $cmd = "git config user.name \"Martijn Schuemie\"; " . - "git config user.email \"schuemie@ohdsi.org\"; " . - "git tag v$r_major.$r_minor.$r_mod ; " . - "git push -q https://\$GH_TOKEN\@github.com/\$GITHUB_REPOSITORY.git --tags"; - - print "cmd: $cmd\n"; - - open(GIT_PUSH, "$cmd |"); - while ($line = ) { - print "push: $line"; - } # TODO Check for errors - close(GIT_PUSH); - print "push: END\n\n"; + $new_version = ""; } -exit($monotonic); +print($new_version);