From eb4f3121bc611e6f5ca600703102a2c54b55e61b Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Wed, 10 Jan 2024 17:44:48 -0800
Subject: [PATCH] CICD: clean up the noisy scripts

This all is way too verbose now that it apparently is working.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 .github/workflows/linux-trusty-5.12.yml | 7 +------
 .github/workflows/windows.yml           | 5 -----
 scripts/get-atomic-buildnr.sh           | 5 +----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/linux-trusty-5.12.yml b/.github/workflows/linux-trusty-5.12.yml
index 29390e98f..23a7589ce 100644
--- a/.github/workflows/linux-trusty-5.12.yml
+++ b/.github/workflows/linux-trusty-5.12.yml
@@ -21,13 +21,8 @@ jobs:
       id: version_number
       if: github.event_name == 'push'
       run: |
-        bash -x ./scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
-        echo "in yml we have PWD $(pwd)"
-        ls -l release-version
-        cat release-version
-        echo
+        bash ./scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
         version=$(cat release-version)
-        echo "version=$version"
         echo "version=$version" >> $GITHUB_OUTPUT
 
     - name: store dummy version and build number for pull request
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8dde3a364..6b0344ffa 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,12 +22,7 @@ jobs:
       if: github.event_name == 'push'
       run: |
         bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release"
-        echo "in yml we have PWD $(pwd)"
-        ls -l release-version
-        cat release-version
-        echo
         version=$(cat release-version)
-        echo "version=$version"
         echo "version=$version" >> $GITHUB_OUTPUT
 
     - name: store dummy version and build number for pull request
diff --git a/scripts/get-atomic-buildnr.sh b/scripts/get-atomic-buildnr.sh
index bdb93742e..2a4184729 100644
--- a/scripts/get-atomic-buildnr.sh
+++ b/scripts/get-atomic-buildnr.sh
@@ -21,11 +21,8 @@ git remote set-url origin "$url"
 git push origin main
 echo "build number prior to get-or-create was $(<latest-subsurface-buildnumber)"
 cd "$PARENT_DIR"
-bash -x subsurface/scripts/get-or-create-build-nr.sh "$1"
+bash subsurface/scripts/get-or-create-build-nr.sh "$1"
 echo "build number after get-or-create is $(<nightly-builds/latest-subsurface-buildnumber)"
 cp nightly-builds/latest-subsurface-buildnumber subsurface/
 [[ -n $3 ]] && echo "$3" > subsurface/latest-subsurface-buildnumber-extension
 bash subsurface/scripts/get-version > subsurface/release-version
-echo "$PARENT_DIR"
-ls -l "$PARENT_DIR"/subsurface/release-version
-cat "$PARENT_DIR"/subsurface/release-version