fixup

daztucker · Feb 7, 2024 · d741a85 · d741a85
1 parent e8828ca
commit d741a85
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
@@ -142,8 +142,8 @@ for TARGET in $TARGETS; do
         INSTALL_BORINGSSL=1
         PACKAGES="${PACKAGES} cmake ninja-build"
        ;;
-    putty-snapshot)
-	INSTALL_PUTTY=snapshot
+    putty-*)
+	INSTALL_PUTTY=$(echo "${TARGET}" | cut -f2 -d-)
 	PACKAGES="${PACKAGES} cmake"
 	;;
     valgrind*)
@@ -246,10 +246,18 @@ if [ ! -z "${INSTALL_ZLIB}" ]; then
      sudo make install prefix=/opt/zlib)
 fi
 
-if [ "${INSTALL_PUTTY}" = "snapshot" ]; then
-    (cd ${HOME} &&
-     wget -q https://tartarus.org/~simon/putty-snapshots/putty.tar.gz &&
-     tar xfz putty.tar.gz && cd putty-* && cmake . && cmake --build . &&
-     sudo cmake --build . --target install)
-     /usr/local/bin/plink -V
+if [ ! -z "${INSTALL_PUTTY}" ]; then
+    case "${ver}" in
+    snapshot)
+	tarball=putty.tar.gz
+	(cd /tmp && wget https://tartarus.org/~simon/putty-snapshots/${tarball})
+	;;
+    *)
+	tarball=putty-${ver}.tar.gz
+	(cd /tmp && wget https://the.earth.li/~sgtatham/putty/${ver}/${tarball})
+	;;
+    esac
+    (cd ${HOME} && tar xfz /tmp/putty.tar.gz && cd putty-* && cmake . &&
+     cmake --build . && sudo cmake --build . --target install)
+    /usr/local/bin/plink -V
 fi
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -77,6 +77,8 @@ jobs:
 #          - { target: ubuntu-latest, config: openssl-3.0 }  # stable branch
 #          - { target: ubuntu-latest, config: openssl-3.2 }  # stable branch
 #          - { target: ubuntu-latest, config: zlib-develop }
+          - { target: ubuntu-latest, config: putty-0.77 }
+          - { target: ubuntu-latest, config: putty-0.80 }
           - { target: ubuntu-latest, config: putty-snapshot }
 #          - { target: ubuntu-22.04, config: pam }
 #          - { target: ubuntu-22.04, config: krb5 }