From 0d84bec86957e9bf075b4092c30541fbee9660b0 Mon Sep 17 00:00:00 2001
From: Geovane Fedrecheski <geonnave@gmail.com>
Date: Tue, 3 Oct 2023 10:19:00 +0200
Subject: [PATCH] refactor: adjust ci fstar to run on main crates

---
 .github/workflows/build-and-test.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 88c60d0c..cf5128b1 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -69,16 +69,15 @@ jobs:
       run: cargo build --package edhoc-rs --package edhoc-crypto --package edhoc-ead --no-default-features --features="${{ matrix.edhoc_lib }}-${{ matrix.crypto }}, ${{ matrix.ead }}" --release
 
 
-  hacspec-to-fstar:
-    # TODO: rename to `generate-fstar` and adjust to use the main library
+  generate-fstar:
     needs: unit-tests
     runs-on: ubuntu-latest
     steps:
     - name: Checkout edhoc-rs
       uses: actions/checkout@v3
 
-    - name: Patch edhoc-rs features
-      run: git apply ./hacspec/adjust_features_for_hax.patch
+    # - name: Patch edhoc-rs features
+    #   run: git apply ./hacspec/adjust_features_for_hax.patch
 
     - name: Checkout hacspec-v2
       uses: actions/checkout@v3
@@ -92,7 +91,7 @@ jobs:
 
     - name: Generate fstar
       run: |
-        docker run --rm -v ${{ github.workspace }}:/edhoc-rs hacspec-v2 bash -c "cd edhoc-rs/hacspec && cargo-hax -C -p edhoc-hacspec -p edhoc-crypto -p edhoc-consts -p edhoc-crypto-hacspec \; into fstar"
+        docker run --rm -v ${{ github.workspace }}:/edhoc-rs hacspec-v2 bash -c "cd edhoc-rs/hacspec && cargo-hax -C --package edhoc-rs --package edhoc-crypto --package edhoc-ead --no-default-features --features="rust-psa, ead-none" --release \; into fstar"
         zip -j -r edhoc-rs-fstar.zip $(find . -name *fst)
 
     - name: Upload artifact
@@ -197,7 +196,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [build-edhoc-package, run-example-on-qemu, build-example-for-cortex-m4, build-coap-example, hacspec-to-fstar, build-static-lib-and-headers]
+    needs: [build-edhoc-package, run-example-on-qemu, build-example-for-cortex-m4, build-coap-example, generate-fstar, build-static-lib-and-headers]
     if: >-
       github.event_name == 'push' &&
       startsWith(github.event.ref, 'refs/tags')