From: Niels Möller <nisse@lysator.liu.se>
Date: Sat, 27 Mar 2021 07:39:26 +0000 (+0100)
Subject: gitlab-ci: Fix only: variables: check, and quote variables.
X-Git-Tag: nettle_3.8_release_20220602~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dda3f4fd81d01e97402f263c03b3209cf1a063d1;p=thirdparty%2Fnettle.git

gitlab-ci: Fix only: variables: check, and quote variables.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e59a7ce..7d3574b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,7 +179,7 @@ remote/s390x:
   before_script:
   # File created as world-readable by gitlab ci machinery.
   - chmod 0600 $SSH_PRIVATE_KEY
-  - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "mkdir -p ci-work/$CI_PIPELINE_IID"
   script:
   - echo $CI_PIPELINE_IID
@@ -187,21 +187,21 @@ remote/s390x:
     ./configure && make PACKAGE_VERSION=snapshot dist &&
       ls -l *.tar.gz
   - cat nettle-snapshot.tar.gz |
-    ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+    ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "cd ci-work/$CI_PIPELINE_IID && tar xzf -"
-  - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && ./configure --disable-documentation"
-  - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && make"
-  - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "cd ci-work/$CI_PIPELINE_IID/nettle-snapshot && make check"
   after_script:
-  - ssh -o 'StrictHostKeyChecking no' -i $SSH_PRIVATE_KEY $S390X_ACCOUNT
+  - ssh -o 'StrictHostKeyChecking no' -i "$SSH_PRIVATE_KEY" "$S390X_ACCOUNT"
     "rm -rf ci-work/$CI_PIPELINE_IID"
   only:
     variables:
-    - $SSH_PRIVATE_KEY
-    - $S390X_ACCOUNT
+    - $SSH_PRIVATE_KEY != ""
+    - $S390X_ACCOUNT != ""
   tags:
   - shared
   - linux