stop building linux/macos shared libraries during release (#574)

snowp · web-flow · commit c776f660ed8f · 2025-08-14T15:51:48.000-04:00
diff --git a/.github/workflows/release_gh.yaml b/.github/workflows/release_gh.yaml
@@ -86,66 +86,6 @@ jobs:
         with:
           name: Capture.android.zip
           path: ./dist/Capture.android.zip
-  # Builds libcapture.so targeting Linux, to support instant-android using the .aar on Linux CI machines.
-  build-android-linux-so:
-    name: Linux x86_64 libcapture.so
-    # Running on ubuntu-latest builds againt a glibc that is more modern than what
-    # instant-android uses in CI, causing a load error. Use 20.04 to link against a compatible
-    # glibc.
-    runs-on: ubuntu-latest
-    needs: ["verify-version"]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - name: Install Clang
-        run: sudo apt-get install -y clang
-
-      - name: build
-        run: ./ci/create_linux_java_so.sh
-      - uses: actions/upload-artifact@v4
-        with:
-          name: libcapture.so
-          path: ./bazel-bin/platform/jvm/libcapture.so
-  # Builds libcapture.dylib targeting macos arm64, to support instant-android using the .aar on arm64 Macs.
-  build-android-macos-arm64:
-    name: arm64 libcapture.dylib
-    runs-on: macos-15
-    needs: ["verify-version"]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - name: 'Update the content of platform/shared/.sdk_version'
-        run: echo "${{ inputs.version }}" > platform/shared/.sdk_version
-      - name: 'Install dependencies'
-        run: ./ci/mac_ci_setup.sh
-      - name: build
-        run: ./bazelw build --announce_rc --config=ci --config=release-common --cpu=darwin_arm64 --platforms @build_bazel_apple_support//platforms:macos_arm64 //platform/jvm:capture && cp bazel-bin/platform/jvm/libcapture.dylib libcapture.dylib.arm64
-      - uses: actions/upload-artifact@v4
-        with:
-          name: libcapture.dylib.arm64
-          path: libcapture.dylib.arm64
-  # Builds libcapture.dylib targeting macos x86_64, to support instant-android using the .aar on arm64 Macs.
-  build-android-macos-x86_64:
-    name: x86_64 libcapture.dylib
-    runs-on: macos-15
-    needs: ["verify-version"]
-    steps:
-      # Checkout repo to Github Actions runner
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
-      - name: 'Update the content of platform/shared/.sdk_version'
-        run: echo "${{ inputs.version }}" > platform/shared/.sdk_version
-      - name: 'Install dependencies'
-        run: ./ci/mac_ci_setup.sh
-      - name: build
-        run: ./bazelw build --announce_rc --config=ci --config=release-common --cpu=darwin_x86_64 //platform/jvm:capture && cp bazel-bin/platform/jvm/libcapture.dylib libcapture.dylib.x86_64
-      - uses: actions/upload-artifact@v4
-        with:
-          name: libcapture.dylib.x86_64
-          path: libcapture.dylib.x86_64
   build-android-example-apps:
     needs: ["verify-version"]
     permissions:
@@ -172,9 +112,6 @@ jobs:
       "ios-release-build",
       "build-ios-example-apps",
       "android-release-build",
-      "build-android-linux-so",
-      "build-android-macos-x86_64",
-      "build-android-macos-arm64",
       "build-android-example-apps",
       "build-android-integrations",
     ]
@@ -187,18 +124,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Capture.android.zip
-      - name: Download Android Capture .so
-        uses: actions/download-artifact@v4
-        with:
-          name: libcapture.so
-      - name: Download Android Capture .dylib.arm64
-        uses: actions/download-artifact@v4
-        with:
-          name: libcapture.dylib.arm64
-      - name: Download Android Capture .dylib.x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: libcapture.dylib.x86_64
       - name: Download Android Example Apps
         uses: actions/download-artifact@v4
         with:
diff --git a/ci/BUILD.shared_libs b/ci/BUILD.shared_libs
diff --git a/ci/capture_android_release.sh b/ci/capture_android_release.sh
@@ -34,11 +34,11 @@ function generate_maven_file() {
 
   echo "+++ Generating maven-metadata.xml for '$location'"
 
-  releases=$(aws s3 ls "$location/" \
-    | grep -v 'maven-metadata.xml' \
-    | grep -v 'io.bitdrift' \
-    | awk '{print $2}' \
-    | sed 's/^\///;s/\/$//')
+  releases=$(aws s3 ls "$location/" |
+    grep -v 'maven-metadata.xml' |
+    grep -v 'io.bitdrift' |
+    awk '{print $2}' |
+    sed 's/^\///;s/\/$//')
 
   python3 "$sdk_repo/ci/generate_maven_metadata.py" --releases "${releases//$'\n'/,}" --library "library_name"
 
@@ -53,33 +53,31 @@ function release_capture_sdk() {
 
   # We get a zip containing:
   #  * the artifacts named per Maven conventions
-  #  * .tar symbols file containing symbols for the stripped release shared libraries.
-  #  * shared dylib libraries
+  #  * .tar symbols file containing symbols for the release build (e.g., for the .aar).
 
   pushd "$(mktemp -d)"
-    unzip -o "$sdk_repo/$capture_archive"
+  unzip -o "$sdk_repo/$capture_archive"
 
-    echo "+++ Uploading artifacts to s3 bucket"
+  echo "+++ Uploading artifacts to s3 bucket"
 
-    local -r remote_location_prefix="$remote_location_root_prefix/capture"
-    local -r name="capture-$version"
+  local -r remote_location_prefix="$remote_location_root_prefix/capture"
+  local -r name="capture-$version"
 
-    files=(\
-      "$sdk_repo/ci/LICENSE.txt" \
-      "$sdk_repo/ci/NOTICE.txt" \
-      "$name.pom" \
-      "$name-javadoc.jar" \
-      "$name-sources.jar" \
-      "$name-symbols.tar" \
-      "$name-dylib.tar" \
-      "$name.aar" \
-    )
+  files=(
+    "$sdk_repo/ci/LICENSE.txt"
+    "$sdk_repo/ci/NOTICE.txt"
+    "$name.pom"
+    "$name-javadoc.jar"
+    "$name-sources.jar"
+    "$name-symbols.tar"
+    "$name.aar"
+  )
 
-    for file in "${files[@]}"; do
-      upload_file "$remote_location_prefix/$version" "$file"
-    done
+  for file in "${files[@]}"; do
+    upload_file "$remote_location_prefix/$version" "$file"
+  done
 
-    generate_maven_file "$remote_location_prefix" "capture"
+  generate_maven_file "$remote_location_prefix" "capture"
   popd
 }
 
@@ -92,16 +90,16 @@ function release_gradle_library() {
   local -r remote_location_prefix="$remote_location_root_prefix/$library_name"
 
   pushd "$(mktemp -d)"
-    unzip -o "$sdk_repo/$archive"
-    
-    # Update the per-version files
-    aws s3 cp "$sdk_repo/ci/LICENSE.txt" "$remote_location_prefix/$version/LICENSE.txt" --region us-east-1
-    aws s3 cp "$sdk_repo/ci/NOTICE.txt" "$remote_location_prefix/$version/NOTICE.txt" --region us-east-1
+  unzip -o "$sdk_repo/$archive"
+
+  # Update the per-version files
+  aws s3 cp "$sdk_repo/ci/LICENSE.txt" "$remote_location_prefix/$version/LICENSE.txt" --region us-east-1
+  aws s3 cp "$sdk_repo/ci/NOTICE.txt" "$remote_location_prefix/$version/NOTICE.txt" --region us-east-1
 
-    # Upload all the files in the zip
-    aws s3 cp . "$remote_location_prefix/$version/" --recursive --region us-east-1
+  # Upload all the files in the zip
+  aws s3 cp . "$remote_location_prefix/$version/" --recursive --region us-east-1
 
-    generate_maven_file "$remote_location_prefix" "$library_name"
+  generate_maven_file "$remote_location_prefix" "$library_name"
   popd
 }
 
@@ -115,15 +113,15 @@ function release_gradle_plugin() {
   local -r remote_location_prefix="$remote_location_root_prefix/$plugin_name/$plugin_marker"
 
   pushd "$(mktemp -d)"
-    unzip -o "$sdk_repo/$archive"
+  unzip -o "$sdk_repo/$archive"
 
-    aws s3 cp "$sdk_repo/ci/LICENSE.txt" "$remote_location_prefix/$version/LICENSE.txt" --region us-east-1
-    aws s3 cp "$sdk_repo/ci/NOTICE.txt" "$remote_location_prefix/$version/NOTICE.txt" --region us-east-1
+  aws s3 cp "$sdk_repo/ci/LICENSE.txt" "$remote_location_prefix/$version/LICENSE.txt" --region us-east-1
+  aws s3 cp "$sdk_repo/ci/NOTICE.txt" "$remote_location_prefix/$version/NOTICE.txt" --region us-east-1
 
-    aws s3 cp . "$remote_location_prefix/$version/" --recursive --region us-east-1
+  aws s3 cp . "$remote_location_prefix/$version/" --recursive --region us-east-1
 
-    generate_maven_file "$remote_location_prefix" "$plugin_marker"
-    popd
+  generate_maven_file "$remote_location_prefix" "$plugin_marker"
+  popd
 }
 
 release_capture_sdk
diff --git a/ci/gh_prepare_android_artifacts.sh b/ci/gh_prepare_android_artifacts.sh
@@ -10,33 +10,17 @@ function prepare_capture_sdk() {
   echo "+++ Preparing Android Capture SDK artifacts for '$version' version"
 
   pushd "$(mktemp -d)"
-    local -r out_artifacts_dir="android-tmp"
-    readonly dylibs_dir="capture-$version-dylib"
+  local -r out_artifacts_dir="android-tmp"
 
-    mkdir "$out_artifacts_dir"
-    mkdir "$dylibs_dir/"
-    mkdir "$dylibs_dir/darwin_arm64/"
-    mkdir "$dylibs_dir/darwin_x86_64/"
+  mkdir "$out_artifacts_dir"
 
-    echo "++ Creating shared dylibs"
+  echo "++ Unzipping Maven Android artifacts"
 
-    mv "$sdk_repo/libcapture.dylib.arm64" "$dylibs_dir/darwin_arm64/libcapture.dylib"
-    mv "$sdk_repo/libcapture.dylib.x86_64" "$dylibs_dir/darwin_x86_64/libcapture.dylib"
-    mv "$sdk_repo/libcapture.so" "$dylibs_dir/"
+  unzip "$sdk_repo/Capture.android.zip" -d "$out_artifacts_dir"
 
-    cp "$sdk_repo/ci/BUILD.shared_libs" "$dylibs_dir"/BUILD
+  echo "++ Creating Android artifacts zip"
 
-    pushd "$dylibs_dir"
-      tar cvf "../$out_artifacts_dir/$dylibs_dir.tar" ./*
-    popd
-
-    echo "++ Unzipping Maven Android artifacts"
-
-    unzip "$sdk_repo/Capture.android.zip" -d "$out_artifacts_dir"
-
-    echo "++ Creating Android artifacts zip"
-
-    (cd "$out_artifacts_dir" && zip -r "$sdk_repo/Capture-$version.android.zip" ./*)
+  (cd "$out_artifacts_dir" && zip -r "$sdk_repo/Capture-$version.android.zip" ./*)
   popd
 }
 
