From dc10092090f015dda32e6048ae95426d4c44c810 Mon Sep 17 00:00:00 2001
From: DmitriyMusatkin <musatkd@amazon.com>
Date: Thu, 12 Sep 2024 13:06:27 -0700
Subject: [PATCH] ci

---
 .github/workflows/ci.yml | 36 +++++++++++++++++++++++++++++++++---
 source/crc64.c           |  2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 550cdcc..f5d68e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,8 +6,8 @@ on:
       - 'main'
 
 env:
-  BUILDER_VERSION: more_compilers
-  BUILDER_SOURCE: channels
+  BUILDER_VERSION: v0.9.63
+  BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-checksums
   LINUX_BASE_IMAGE: ubuntu-18-x64
@@ -50,6 +50,8 @@ jobs:
           - clang-10
           - clang-11
           - clang-15
+          - clang-16
+          - clang-17
           - clang-18
           - gcc-4.8
           - gcc-5
@@ -57,6 +59,8 @@ jobs:
           - gcc-7
           - gcc-8
           - gcc-11
+          - gcc-12
+          - gcc-13
     steps:
       # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
       - name: Build ${{ env.PACKAGE_NAME }}
@@ -210,7 +214,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         id: test
-        uses: cross-platform-actions/action@v0.23.0
+        uses: cross-platform-actions/action@v0.24.0
         with:
           operating_system: freebsd
           architecture: x86-64
@@ -222,3 +226,29 @@ jobs:
             python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
             chmod a+x builder
             ./builder build -p ${{ env.PACKAGE_NAME }}
+
+  openbsd:
+    runs-on: ubuntu-22.04 # latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # OpenBSD only supports the two most recent releases
+        version: ['7.4', '7.5']
+    steps:
+      # Cannot use builder to checkout as OpenBSD doesn't ship git in the base install
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build ${{ env.PACKAGE_NAME }} + consumers
+        uses: cross-platform-actions/action@v0.24.0
+        with:
+          operating_system: openbsd
+          version: ${{ matrix.version }}
+          cpu_count: 4
+          shell: bash
+          environment_variables: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION AWS_REGION
+          run: |
+            sudo pkg_add awscli py3-pip py3-urllib3
+            python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
+            chmod a+x builder
+            ./builder build -p ${{ env.PACKAGE_NAME }}
diff --git a/source/crc64.c b/source/crc64.c
index 04bb07d..9e02ec9 100644
--- a/source/crc64.c
+++ b/source/crc64.c
@@ -101,7 +101,7 @@ uint64_t aws_checksums_crc64nvme(const uint8_t *input, int length, uint64_t prev
             s_crc64nvme_fn_ptr = aws_checksums_crc64nvme_intel_avx512;
         } else
 #    endif
-#    if defined(AWS_HAVE_CLMUL) && defined(AWS_HAVE_AVX2_INTRINSICS)
+#       if defined(AWS_HAVE_CLMUL) && defined(AWS_HAVE_AVX2_INTRINSICS)
         if (aws_cpu_has_feature(AWS_CPU_FEATURE_CLMUL) && aws_cpu_has_feature(AWS_CPU_FEATURE_AVX2)) {
             s_crc64nvme_fn_ptr = aws_checksums_crc64nvme_intel_clmul;
         } else {