From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 17 Feb 2021 23:05:03 +0000 (+1100)
Subject: Always intall moduli.
X-Git-Tag: V_8_5_P1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c293868e4b4e8e74e3ea15b8dff90f6b089967a;p=thirdparty%2Fopenssh-portable.git

Always intall moduli.

Allows us to run tests without falling back to a fixed modulus.  Ensure that
the directory exists.
---

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index ca47ff6ee..7f276e5d5 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -38,8 +38,8 @@ jobs:
       run: ./.github/configure.sh ${{ matrix.configs }}
     - name: make
       run: make -j2
-    - name: copy moduli
-      run: sudo cp moduli /usr/local/etc/
+    - name: install moduli
+      run: sudo sh -c "mkdir -p /usr/local/etc/; cp moduli /usr/local/etc/"
     - name: make tests
       run: ./.github/run_test.sh ${{ matrix.configs }}
       env:
diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
index 637ce959f..2f76dfdf5 100644
--- a/.github/workflows/selfhosted.yml
+++ b/.github/workflows/selfhosted.yml
@@ -49,6 +49,8 @@ jobs:
           config.log
     - name: make
       run: vmrun make
+    - name: install moduli
+      run: sudo sh -c "mkdir -p /usr/local/etc/; cp moduli /usr/local/etc/"
     - name: make tests
       run: vmrun ./.github/run_test.sh ${{ matrix.configs }}
     - name: save regress logs