From 378fddb645d6666b6134e38dd726e89ad66db807 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Sun, 23 Apr 2023 14:13:28 +0200
Subject: [PATCH] fix or exclude failing CI actions

Due to https://github.com/open-quantum-safe/liboqs-rust/issues/202 it is not
yet possible to build the static Rosenpass version for `i686`. The CI actions
which fail for this reason have been excluded for now. Further on, some
the workflow names have been shortened for better overview.
---
 .github/workflows/nix.yaml     | 15 ++++++++++++++-
 .github/workflows/qc.yaml      |  2 +-
 .github/workflows/release.yaml |  1 -
 flake.nix                      |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index c1428cc3..8fa60fbc 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -1,4 +1,4 @@
-name: Nix Related Actions
+name: Nix
 permissions:
   contents: write
 on:
@@ -26,6 +26,19 @@ jobs:
           - rosenpass-static-oci-image
           - proof-proverif
           - whitepaper
+        exclude:
+          # these do not exist
+          - nix-system: i686-linux
+            derivation: proof-proverif
+          - nix-system: i686-linux
+            derivation: whitepaper
+
+          # these fail currently
+          # TODO enable once https://github.com/open-quantum-safe/liboqs-rust/issues/202 is fixed
+          - nix-system: i686-linux
+            derivation: rosenpass-static
+          - nix-system: i686-linux
+            derivation: rosenpass-static-oci-image
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/qc.yaml b/.github/workflows/qc.yaml
index 68460781..6e9cf252 100644
--- a/.github/workflows/qc.yaml
+++ b/.github/workflows/qc.yaml
@@ -1,4 +1,4 @@
-name: Quality Control
+name: QC
 on:
   pull_request:
   push:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f63b3450..20759c27 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -16,7 +16,6 @@ jobs:
       matrix:
         nix-system:
           - x86_64-linux
-          - i686-linux
           - aarch64-linux
     steps:
       - uses: actions/checkout@v3
diff --git a/flake.nix b/flake.nix
index 90c4b0e9..b3fd5f60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,10 +20,10 @@
       #
       (flake-utils.lib.eachSystem [
         "x86_64-linux"
-        "i686-linux"
         "aarch64-linux"
 
         # unsuported best-effort
+        "i686-linux"
         "x86_64-darwin"
         "aarch64-darwin"
         # "x86_64-windows"