build scripts: Add git pull

Add a git pull to make sure we got the latest version. If someone has pushed tags and we have an older version of the repo locally we might not see newer tags.
tillitis · Nov 22, 2023 · 728ac24 · 728ac24
1 parent 7f428b9
commit 728ac24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build-podman.sh b/build-podman.sh
@@ -10,14 +10,14 @@ printf "Building signer with version: %s\n" "$signer_version"
 
 if [ -d ../tkey-libs ]
 then
-    (cd ../tkey-libs; git checkout "$tkey_libs_version")
+    (cd ../tkey-libs; git checkout main; git pull; git checkout "$tkey_libs_version")
 else
     git clone -b "$tkey_libs_version" https://github.com/tillitis/tkey-libs.git ../tkey-libs
 fi
 
 if [ -d ../tkey-device-signer ]
 then
-    (cd ../tkey-device-signer; git checkout "$signer_version")
+    (cd ../tkey-device-signer; git checkout main; git pull; git checkout "$signer_version")
 else
     git clone -b "$signer_version" https://github.com/tillitis/tkey-device-signer.git ../tkey-device-signer
 fi

diff --git a/build.sh b/build.sh
@@ -8,14 +8,14 @@ printf "Building signer with version: %s\n" "$signer_version"
 
 if [ -d ../tkey-libs ]
 then
-    (cd ../tkey-libs; git checkout "$tkey_libs_version")
+    (cd ../tkey-libs; git checkout main; git pull; git checkout "$tkey_libs_version")
 else
     git clone -b "$tkey_libs_version" https://github.com/tillitis/tkey-libs.git ../tkey-libs
 fi
 
 if [ -d ../tkey-device-signer ]
 then
-    (cd ../tkey-device-signer; git checkout "$signer_version")
+    (cd ../tkey-device-signer; git checkout main; git pull; git checkout "$signer_version")
 else
     git clone -b "$signer_version" https://github.com/tillitis/tkey-device-signer.git ../tkey-device-signer
 fi