Fix: Bundle correct sentry-cli os/arch

.github/workflows/integration-test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -21,7 +21,7 @@ jobs:
         with:
           ruby-version: '3.1.2'
 
-      - if: matrix.os == 'macos-latest'
+      - if: matrix.os != 'windows-latest'
         name: Install Fastlane {{ matrix.os }}
         run: sudo gem install fastlane
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- fix: Bundle correct sentry-cli os/arch (#164)
+
 ## 1.13.0
 
 ### Features

bin/sentry_cli_path

@@ -2,8 +2,18 @@
 
 require 'os'
 
-if OS.windows?
-  print File.join(__dir__, 'sentry-cli-Windows-x86_64.exe')
-else
+if OS.mac?
   print File.join(__dir__, 'sentry-cli-Darwin-universal')
+elsif OS.windows?
+  if OS.bits == 64
+    print File.join(__dir__, 'sentry-cli-Windows-x86_64.exe')
+  else
+    print File.join(__dir__, 'sentry-cli-Windows-i686.exe')
+  end
+else
+  if OS.bits == 64
+    print File.join(__dir__, 'sentry-cli-Linux-x86_64')
+  else
+    print File.join(__dir__, 'sentry-cli-Linux-i686')
+  end
 end

fastlane-plugin-sentry.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/getsentry/sentry-fastlane-plugin"
   spec.license       = "MIT"
 
-  spec.files         = Dir["lib/**/*"] + %w(README.md LICENSE bin/sentry-cli-Darwin-universal bin/sentry-cli-Windows-x86_64.exe)
+  spec.files         = Dir["lib/**/*"] + %w(README.md LICENSE bin/sentry-cli-Darwin-universal bin/sentry-cli-Windows-i686.exe bin/sentry-cli-Windows-x86_64.exe bin/sentry-cli-Linux-i686 bin/sentry-cli-Linux-x86_64)
   spec.executables << 'sentry_cli_path'
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

script/sentry-cli-download.sh

@@ -7,7 +7,7 @@ function prop {
 }
 
 base_url="$(prop 'repo')/releases/download/$(prop 'version')"
-platforms=(Darwin-universal Windows-x86_64.exe)
+platforms=(Darwin-universal Linux-i686 Linux-x86_64 Windows-i686.exe Windows-x86_64.exe)
 target_dir="bin"
 
 for platform in "${platforms[@]}"