chore: iterate on CI / geyser strategy

.github/workflows/release_cli.yaml

@@ -63,6 +63,10 @@ jobs:
             platform: windows
             target: x86_64-pc-windows-msvc
             architecture: x64
+          - os: macos-latest
+            platform: darwin
+            target: x86_64-apple-darwin
+            architecture: x64
           - os: macos-latest
             platform: darwin
             target: aarch64-apple-darwin
@@ -113,20 +117,29 @@ jobs:
           echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
           echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
 
-      - name: Configure openssl (macos)
+      - name: Configure openssl (macos x64)
         if: matrix.os == 'macos-latest' && matrix.architecture == 'x64'
         run: |
           brew install openssl@1.1
           echo "OPENSSL_DIR=$(brew --prefix openssl@1.1)" >> $GITHUB_ENV
           echo "OPENSSL_INCLUDE_DIR=$(brew --prefix openssl@1.1)/include" >> $GITHUB_ENV
           echo "OPENSSL_LIB_DIR=$(brew --prefix openssl@1.1)/lib" >> $GITHUB_ENV
 
+      - name: Configure openssl (macos arm64)
+        if: matrix.os == 'macos-latest' && matrix.architecture == 'arm64'
+        run: |
+          brew install openssl@1.1
+          echo "OPENSSL_DIR=$(brew --prefix openssl@1.1)" >> $GITHUB_ENV
+          echo "OPENSSL_INCLUDE_DIR=$(brew --prefix openssl@1.1)/include" >> $GITHUB_ENV
+          echo "OPENSSL_LIB_DIR=$(brew --prefix openssl@1.1)/lib" >> $GITHUB_ENV
+
       - name: Install LLVM (macOS)
         if: matrix.os == 'macos-latest'
         run: |
           brew install llvm
           echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" >> $GITHUB_ENV
           echo "BINDGEN_EXTRA_CLANG_ARGS=-I$(xcrun --show-sdk-path)/usr/include" >> $GITHUB_ENV
+          echo "LLVM_CONFIG_PATH=$(brew --prefix llvm)/bin/llvm-config" >> $GITHUB_ENV
 
       - name: Install LLVM/Clang (Linux)
         if: matrix.os == 'ubuntu-22.04'
@@ -182,11 +195,21 @@ jobs:
         run: 
           cargo build --release --locked --target ${{ matrix.target }} --features supervisor_ui --features version_check --features subgraph
 
-      - name: Build - Cargo (Unix)
-        if: matrix.os != 'windows-latest'
+      - name: Build - Cargo (macOS x64)
+        if: matrix.os == 'macos-latest' && matrix.architecture == 'x64'
         run: 
           cargo build --release --locked --target ${{ matrix.target }} --features supervisor_ui --features version_check --features subgraph
 
+      - name: Build - Cargo (macOS ARM64)
+        if: matrix.os == 'macos-latest' && matrix.architecture == 'arm64'
+        run: 
+          cargo build --release --locked --target ${{ matrix.target }} --features supervisor_ui --features version_check --features subgraph
+
+      - name: Build - Cargo (Linux)
+        if: matrix.os == 'ubuntu-22.04'
+        run: 
+          cargo build --release --locked --target ${{ matrix.target }} --features supervisor_ui --features version_check --features subgraph --features geyser_plugin
+
       # Don't compress for Windows because winget can't yet unzip files
       - name: Compress cargo artifact (not windows)
         if: matrix.os != 'windows-latest'

.github/workflows/docker.yml → .github/workflows/release_image.yml

@@ -1,9 +1,6 @@
 name: Build and Push Docker Image
 
 on:
-  push:
-    branches:
-      - main
   release:
     types: [published]
 
@@ -36,12 +33,10 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
-            type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=latest
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5