Merge remote-tracking branch 'origin/master' into assetCatalogParsing

Author: szokeasaurusrex

.github/workflows/build.yml

@@ -176,7 +176,7 @@ jobs:
       TARGET: ${{ matrix.arch }}-pc-windows-msvc
 
     name: Windows ${{ matrix.arch }}
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 3.28.18
+        uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # 3.28.19
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,7 +48,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 3.28.18
+        uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # 3.28.19
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -59,4 +59,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 3.28.18
+        uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # 3.28.19

.gitignore

@@ -7,6 +7,7 @@ dump
 checksums.txt
 yarn-error.log
 
+.sentryclirc
 /sentry-cli
 /sentry-cli.exe
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.84-alpine AS sentry-build
+FROM rust:1.87.0-alpine3.20@sha256:126df0f2a57e675f9306fe180b833982ffb996e90a92a793bb75253cfeed5475 AS sentry-build
 
 # Install build dependencies
 RUN apk add musl-dev perl openssl-dev make
@@ -18,7 +18,7 @@ RUN touch src/main.rs && cargo build --release --features managed
 # Copy the compiled binary to a target-independent location so it can be picked up later
 RUN cp target/release/sentry-cli /usr/local/bin/sentry-cli
 
-FROM alpine:3.14
+FROM alpine:3.22.0@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715
 WORKDIR /work
 RUN apk add --no-cache ca-certificates
 COPY ./docker-entrypoint.sh /

src/api/data_types/chunking/mobile_app.rs

@@ -0,0 +1,22 @@
+use serde::{Deserialize, Serialize};
+use sha1_smol::Digest;
+
+use super::ChunkedFileState;
+
+#[derive(Debug, Serialize)]
+pub struct ChunkedMobileAppRequest<'a> {
+    pub checksum: Digest,
+    pub chunks: &'a [Digest],
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub git_sha: Option<&'a str>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub build_configuration: Option<&'a str>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AssembleMobileAppResponse {
+    pub state: ChunkedFileState,
+    pub missing_chunks: Vec<Digest>,
+    pub detail: Option<String>,
+}

src/api/data_types/chunking/mod.rs

@@ -6,11 +6,13 @@ mod compression;
 mod dif;
 mod file_state;
 mod hash_algorithm;
+mod mobile_app;
 mod upload;
 
 pub use self::artifact::{AssembleArtifactsResponse, ChunkedArtifactRequest};
 pub use self::compression::ChunkCompression;
 pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
 pub use self::file_state::ChunkedFileState;
 pub use self::hash_algorithm::ChunkHashAlgorithm;
+pub use self::mobile_app::{AssembleMobileAppResponse, ChunkedMobileAppRequest};
 pub use self::upload::{ChunkServerOptions, ChunkUploadCapability};

src/api/data_types/chunking/upload/capability.rs

@@ -30,6 +30,9 @@ pub enum ChunkUploadCapability {
     /// Upload of il2cpp line mappings
     Il2Cpp,
 
+    /// Upload of preprod artifacts
+    PreprodArtifacts,
+
     /// Any other unsupported capability (ignored)
     Unknown,
 }
@@ -49,6 +52,7 @@ impl<'de> Deserialize<'de> for ChunkUploadCapability {
             "sources" => ChunkUploadCapability::Sources,
             "bcsymbolmaps" => ChunkUploadCapability::BcSymbolmap,
             "il2cpp" => ChunkUploadCapability::Il2Cpp,
+            "preprod_artifacts" => ChunkUploadCapability::PreprodArtifacts,
             _ => ChunkUploadCapability::Unknown,
         })
     }

src/api/mod.rs

@@ -1018,6 +1018,32 @@ impl<'a> AuthenticatedApi<'a> {
             .convert_rnf(ApiErrorKind::ReleaseNotFound)
     }
 
+    pub fn assemble_mobile_app(
+        &self,
+        org: &str,
+        project: &str,
+        checksum: Digest,
+        chunks: &[Digest],
+        git_sha: Option<&str>,
+        build_configuration: Option<&str>,
+    ) -> ApiResult<AssembleMobileAppResponse> {
+        let url = format!(
+            "/projects/{}/{}/files/preprodartifacts/assemble/",
+            PathArg(org),
+            PathArg(project)
+        );
+
+        self.request(Method::Post, &url)?
+            .with_json_body(&ChunkedMobileAppRequest {
+                checksum,
+                chunks,
+                git_sha,
+                build_configuration,
+            })?
+            .send()?
+            .convert_rnf(ApiErrorKind::ProjectNotFound)
+    }
+
     pub fn associate_proguard_mappings(
         &self,
         org: &str,