build-lxd.yml: Skip setup-lxd step if using incus

Signed-off-by: Tobias Knöppler <[email protected]>
nextcloud · Apr 22, 2024 · 7317a2f · 7317a2f
1 parent 9a2880a
commit 7317a2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-lxd.yml b/.github/workflows/build-lxd.yml
@@ -70,6 +70,7 @@ jobs:
       - name: Cleanup lxd
         run: test -z "$("$LXC" profile device show default | grep eth0)" || "$LXC" profile device remove default eth0
       - uses: whywaita/setup-lxd@v1
+        if: ${{ needs.determine-runner.outputs.lxc_cmd == 'lxc' }}
         continue-on-error: true
         with:
           lxd_version: latest/stable
@@ -144,6 +145,7 @@ jobs:
           echo "VERSION=$version" >> "$GITHUB_ENV"
           echo "previous_version=${version}" >> $GITHUB_OUTPUT
       - uses: whywaita/setup-lxd@v1
+        if: ${{ needs.determine-runner.outputs.lxc_cmd == 'lxc' }}
         continue-on-error: true
         with:
           lxd_version: latest/stable
@@ -185,6 +187,7 @@ jobs:
       LXC: "${{ needs.determine-runner.outputs.lxc_cmd }}"
     steps:
       - uses: whywaita/setup-lxd@v1
+        if: ${{ needs.determine-runner.outputs.lxc_cmd == 'lxc' }}
         continue-on-error: true
         with:
           lxd_version: latest/stable
@@ -369,6 +372,7 @@ jobs:
       - name: Cleanup lxd
         run: test -z "$("$LXC" profile device show default | grep eth0)" || "$LXC" profile device remove default eth0
       - uses: whywaita/setup-lxd@v1
+        if: ${{ needs.determine-runner.outputs.lxc_cmd == 'lxc' }}
         continue-on-error: true
         with:
           lxd_version: latest/stable

diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
@@ -314,8 +314,9 @@ jobs:
               echo -e "${LOG_DIAG} ncp.log: "
               "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c "tail -n20 /var/log/ncp.log" |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               echo "================"
-              echo "Nextcloud log: "
-              "${CONTAINER_CMD[@]}" -q ncp cat /opt/ncdata/data/nextcloud.log
+              echo "${LOG_DIAG} Nextcloud log: "
+              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
+              "${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               sleep 12
               continue
             }

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
@@ -312,11 +312,11 @@ jobs:
             echo "==========================================="
             ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" tail /var/log/ncp-install.log;
             echo "==========================================="
-            echo "and ncp.log:"
+            echo "ncp.log:"
             echo "==========================================="
             ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" tail /var/log/ncp.log;
             echo "==========================================="
-            echo "and nextcloud.log:"
+            echo "nextcloud.log:"
             ssh "${SSH_OPTIONS[@]}" "root@${SERVER_ADDRESS}" tail /opt/ncdata/data/nextcloud.log;
             exit 1
           }