fix release for macos x86_64 and arm64

.github/workflows/release.yml

@@ -56,6 +56,9 @@ jobs:
 
   build-macos:
     runs-on: macos-latest
+    strategy:
+      matrix:
+        arch: [x86_64, arm64]   # build both architectures
     steps:
       - uses: actions/checkout@v3
         with:
@@ -77,17 +80,27 @@ jobs:
 
       - name: Build
         run: |
-          conan install . --build=missing
+          BUILD_DIR="build_${{ matrix.arch }}"
-          conan build .
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+
+          # Pass architecture explicitly to CMake via environment
+          export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
+
+          # Run Conan install/build
+          conan install .. --build=missing
+          conan build ..
+
+          cd ..
 
       - name: Package
         run: |
           TAG=${GITHUB_REF##refs/tags/}
-          OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+          OS="macos"
-          ARCH=$(uname -m)
+          ARCH="${{ matrix.arch }}"
           FOLDER="chloride-$TAG-$OS-$ARCH"
           TAR="$FOLDER.tar.gz"
-          mv build/bin "$FOLDER"
+          mv build_${ARCH}/bin "$FOLDER"
           cp LICENSE.txt "$FOLDER"
           tar -czf "$TAR" "$FOLDER"
           echo "TAR_NAME=$TAR" >> $GITHUB_ENV
@@ -95,7 +108,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: macos-artifact
+          name: macos-${{ matrix.arch }}-artifact
           path: ${{ env.TAR_NAME }}
 
   build-windows:
@@ -120,6 +133,7 @@ jobs:
             mingw-w64-x86_64-cmake
             mingw-w64-x86_64-python
             mingw-w64-x86_64-python-pip
+            msys/flex
 
       - name: Install Conan
         run: |
@@ -130,19 +144,19 @@ jobs:
       - name: Build Project
         run: |
           conan install . --profile mingw-profile.txt --build=missing
-          conan build .
+          conan build . --profile mingw-profile.txt
 
       - name: Package
         run: |
-          $TAG = $env:GITHUB_REF -replace 'refs/tags/', ''
+          TAG=${GITHUB_REF##refs/tags/}
-          $ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
+          OS="windows"
-          $FOLDER = "chloride-$TAG-windows-$ARCH"
+          ARCH=$(uname -m)
-          $ZIP = "$FOLDER.zip"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
-          Rename-Item bin $FOLDER
+          TAR="$FOLDER.tar.gz"
-          Copy-Item LICENSE.txt $FOLDER
+          mv build/bin "$FOLDER"
-          Compress-Archive -Path $FOLDER -DestinationPath $ZIP
+          cp LICENSE.txt "$FOLDER"
-          echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
+          tar -czf "$TAR" "$FOLDER"
-        shell: pwsh
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -57,6 +57,7 @@ target_link_libraries(argon PRIVATE
     BDWgc::BDWgc
     gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

conanfile.py

@@ -33,11 +33,6 @@ class ArgonConan(ConanFile):
         os.environ["CONAN_NON_INTERACTIVE"] = "1"
         tc = CMakeToolchain(self)
 
-        if os.name == "nt":  # Windows
-            flex_path = which("win_flex") or which("win_flex.exe")
-            if not flex_path:
-                raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
-        else:
         flex_path = which("flex")
         if not flex_path:
             raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")