From 75aafc0c8c6eacfbd7035ecf2a731dd7447f9dde Mon Sep 17 00:00:00 2001
From: Narrat <autumn-wind@web.de>
Date: Mon, 5 Aug 2024 15:32:54 +0200
Subject: [PATCH] CI optimization (#531)

* portable was moved into extras and is unmaintained
* the CI tests for the portable rewrite are archived
---
 .github/workflows/linux.yml                   | 10 +++++-----
 .../portable/gh-ci-portable.yml               | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename .github/workflows/portable.yml => extras/portable/gh-ci-portable.yml (85%)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4ed53005..a2a963f8 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -5,14 +5,14 @@ on:
   push:
     paths-ignore:
       - 'doc/**'
-      - 'portable/**'
+      - 'extras/portable/**'
       - '*.md'
     branches:
     - master
   pull_request:
     paths-ignore:
       - 'doc/**'
-      - 'portable/**'
+      - 'extras/portable/**'
       - '*.md'
     branches:
     - master
@@ -33,13 +33,13 @@ jobs:
           sudo apt-get update -y -q
           sudo apt-get install -y -q zsh cryptsetup gpg gawk libgcrypt20-dev steghide qrencode python2 python3-pip python3-dev libssl-dev make gcc sudo gettext bsdmainutils file pinentry-curses xxd libsodium23 libsodium-dev
       - uses: actions/checkout@v3
-      - name: Build the KDF extras
+      - name: Build the pbkdf2 extras
         run: |
           make --directory=extras/kdf-keys
           sudo make --directory=extras/kdf-keys install
+      - name: Run pbkdf2 tests
+        run: sudo make -C extras/kdf-keys test
       - name: Disable swap
         run: sudo swapoff -a
       - name: Run main tests
         run: sudo make test
-      - name: Run KDF tests
-        run: sudo make -C extras/kdf-keys test
diff --git a/.github/workflows/portable.yml b/extras/portable/gh-ci-portable.yml
similarity index 85%
rename from .github/workflows/portable.yml
rename to extras/portable/gh-ci-portable.yml
index 200d4781..dd897ca2 100644
--- a/.github/workflows/portable.yml
+++ b/extras/portable/gh-ci-portable.yml
@@ -2,13 +2,13 @@ name: ☠️ Portable tomb
 on:
   push:
     paths:
-      - 'portable/**'
+      - 'extras/portable/**'
       - '.github/workflows/portable.yml'
     branches:
     - master
   pull_request:
     paths:
-      - 'portable/**'
+      - 'extras/portable/**'
       - '.github/workflows/portable.yml'
     branches:
     - master
@@ -30,11 +30,11 @@ jobs:
           sudo apt-get install -q -y make openssl wget fuse3 util-linux
           sudo make -C portable download-deps-ubuntu20
       - name: Run portable tomb test
-        run: sudo make -C portable create-open-close
+        run: sudo make -C extras/portable create-open-close
       - uses: actions/upload-artifact@v3
         with:
           name: ubuntu-test.tomb
-          path: portable/test.tomb*
+          path: extras/portable/test.tomb*
           retention-days: 1
 
   freebsd:
@@ -47,7 +47,7 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: ubuntu-test.tomb
-        path: portable
+        path: extras/portable
     - name: Test in FreeBSD
       id: test
       uses: vmactions/freebsd-vm@v0
@@ -62,12 +62,12 @@ jobs:
           chmod a+x /usr/bin/veracrypt /usr/bin/zenroom
           kldload fusefs
         run: |
-          sudo gmake -C portable
+          sudo gmake -C extras/portable
           sudo gmake -C portable check-random-data
     - uses: actions/upload-artifact@v3
       with:
         name: freebsd-test.tomb
-        path: portable/test.tomb*
+        path: extras/portable/test.tomb*
         retention-days: 1
 
   ubuntu-last-cleanup:
@@ -79,14 +79,14 @@ jobs:
       - name: Install compiler and dependencies
         run: |
           sudo apt-get install -q -y make openssl wget fuse3 util-linux
-          sudo make -C portable download-deps-ubuntu20
+          sudo make -C extras/portable download-deps-ubuntu20
       - name: Download tomb built on FreeBSD
         uses: actions/download-artifact@v3
         with:
           name: freebsd-test.tomb
-          path: portable
+          path: extras/portable
       - name: Check integrity FreeBSD->Ubuntu
-        run: sudo make -C portable check-random-data
+        run: sudo make -C extras/portable check-random-data
       - name: delete FreeBSD tomb artifacts
         uses: geekyeggo/delete-artifact@v2
         with: