Bitrise cache integration (patched from v2.330.0)

Author: bitrise-bot

src/Runner.Worker/Handlers/CacheEnvironmentHelper.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+
+namespace GitHub.Runner.Worker.Handlers
+{
+    /// <summary>
+    /// Helper to override ACTIONS_CACHE_URL and ACTIONS_RESULTS_URL environment variables
+    /// with values from the actual process environment (e.g. set by the cache proxy),
+    /// while preserving the original values for downstream use.
+    /// </summary>
+    public static class CacheEnvironmentHelper
+    {
+        /// <summary>
+        /// Saves the current values of ACTIONS_CACHE_URL and ACTIONS_RESULTS_URL into
+        /// ACTIONS_CACHE_URL_ORIGINAL and ACTIONS_RESULTS_URL_ORIGINAL, then overrides
+        /// them with values from the actual process environment variables.
+        /// Also sets ACTIONS_CACHE_SERVICE_V2 to "true".
+        /// </summary>
+        public static void OverrideCacheEnvironment(Dictionary<string, string> environment)
+        {
+            // Save original values so the cache proxy (or other consumers) can reach the real backend
+            if (environment.TryGetValue("ACTIONS_CACHE_URL", out var originalCacheUrl))
+            {
+                environment["ACTIONS_CACHE_URL_ORIGINAL"] = originalCacheUrl;
+            }
+
+            if (environment.TryGetValue("ACTIONS_RESULTS_URL", out var originalResultsUrl))
+            {
+                environment["ACTIONS_RESULTS_URL_ORIGINAL"] = originalResultsUrl;
+            }
+
+            // Override with values from the process environment (set by the cache proxy)
+            var envCacheUrl = System.Environment.GetEnvironmentVariable("ACTIONS_CACHE_URL");
+            if (!string.IsNullOrEmpty(envCacheUrl))
+            {
+                environment["ACTIONS_CACHE_URL"] = envCacheUrl;
+            }
+
+            var envResultsUrl = System.Environment.GetEnvironmentVariable("ACTIONS_RESULTS_URL");
+            if (!string.IsNullOrEmpty(envResultsUrl))
+            {
+                environment["ACTIONS_RESULTS_URL"] = envResultsUrl;
+            }
+
+            // Enable cache service v2
+            environment["ACTIONS_CACHE_SERVICE_V2"] = "true";
+        }
+    }
+}

src/Runner.Worker/Handlers/ContainerActionHandler.cs

@@ -245,6 +245,9 @@ public async Task RunAsync(ActionRunStage stage)
                 Environment["ACTIONS_RESULTS_URL"] = resultsUrl;
             }
 
+            // Apply Cache URL overrides
+            CacheEnvironmentHelper.OverrideCacheEnvironment(Environment);
+
             foreach (var variable in this.Environment)
             {
                 container.ContainerEnvironmentVariables[variable.Key] = container.TranslateToContainerPath(variable.Value);

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -77,6 +77,9 @@ public async Task RunAsync(ActionRunStage stage)
                 Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
             }
 
+            // Apply Cache URL overrides
+            CacheEnvironmentHelper.OverrideCacheEnvironment(Environment);
+
             // Resolve the target script.
             string target = null;
             if (stage == ActionRunStage.Main)

src/Runner.Worker/Handlers/bitrise.yml

@@ -0,0 +1,128 @@
+---
+format_version: '23'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: other
+
+app:
+  envs:
+  - R2_BUCKET: $R2_BUCKET
+  - R2_ACCESS_KEY_ID: $R2_ACCESS_KEY_ID
+  - R2_SECRET_ACCESS_KEY: $R2_SECRET_ACCESS_KEY
+  - R2_ENDPOINT: $R2_ENDPOINT
+  - GCS_BUCKET: $GCS_BUCKET
+  - GCS_SERVICE_ACCOUNT_JSON: $GCS_SERVICE_ACCOUNT_JSON
+
+trigger_map:
+- tag: v\d+.\d+.\d+-bitrise
+  workflow: upload-release-assets
+
+workflows:
+  test:
+    after_run:
+    - upload-release-assets
+    envs:
+    - BITRISE_GIT_TAG: "v2.331.0-bitrise"
+  upload-release-assets:
+    envs:
+    - TAG: $BITRISE_GIT_TAG
+    steps:
+    - script@1:
+        title: Download GitHub release assets
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+            set -euo pipefail
+            
+            echo "--- Fetching release for tag: ${TAG}"
+            
+            RELEASE_JSON=$(curl -sf \
+              -H "Accept: application/vnd.github+json" \
+              "https://api.github.com/repos/bitrise-io/github-runner/releases/tags/${TAG}")
+            
+            RELEASE_NAME=$(echo "${RELEASE_JSON}" | jq -r '.name')
+            echo "Found release: ${RELEASE_NAME}"
+            
+            ASSETS=$(echo "${RELEASE_JSON}" | jq -c '.assets[]')
+            
+            if [ -z "${ASSETS}" ]; then
+              echo "No assets found for release ${TAG}"
+              exit 1
+            fi
+            
+            DOWNLOAD_DIR="${BITRISE_SOURCE_DIR}/release-assets"
+            mkdir -p "${DOWNLOAD_DIR}"
+            
+            echo "${ASSETS}" | while IFS= read -r asset; do
+              NAME=$(echo "${asset}" | jq -r '.name')
+              DOWNLOAD_URL=$(echo "${asset}" | jq -r '.url')
+            
+              echo "Downloading: ${NAME}"
+              curl -sfL \
+                -H "Accept: application/octet-stream" \
+                "${DOWNLOAD_URL}" \
+                -o "${DOWNLOAD_DIR}/${NAME}"
+            done
+            
+            echo "Downloaded assets:"
+            ls -lh "${DOWNLOAD_DIR}"
+            
+            envman add --key RELEASE_ASSETS_DIR --value "${DOWNLOAD_DIR}"
+            envman add --key RELEASE_TAG --value "${TAG}"
+
+    - script@1:
+        title: Upload assets to R2
+        run_if: "false"
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+            set -euo pipefail
+            
+            echo "--- Configuring AWS CLI for R2"
+            
+            export AWS_ACCESS_KEY_ID="${R2_ACCESS_KEY_ID}"
+            export AWS_SECRET_ACCESS_KEY="${R2_SECRET_ACCESS_KEY}"
+            export AWS_DEFAULT_REGION="auto"
+            
+            R2_PREFIX="${RELEASE_TAG}"
+            
+            echo "--- Uploading assets to s3://${R2_BUCKET}/${R2_PREFIX}/"
+            
+            for file in "${RELEASE_ASSETS_DIR}"/*; do
+              FILENAME=$(basename "${file}")
+              echo "Uploading: ${FILENAME}"
+              aws s3 cp "${file}" "s3://${R2_BUCKET}/${R2_PREFIX}/${FILENAME}" \
+                --endpoint-url "${R2_ENDPOINT}"
+            done
+            
+            echo "--- Upload complete. Verifying:"
+            aws s3 ls "s3://${R2_BUCKET}/${R2_PREFIX}/" \
+              --endpoint-url "${R2_ENDPOINT}"
+
+    - script@1:
+        title: Upload assets to GCS
+        run_if: "false"
+        inputs:
+        - content: |
+            #!/usr/bin/env bash
+            set -euo pipefail
+            
+            echo "--- Authenticating with GCP"
+            
+            echo "${GCS_SERVICE_ACCOUNT_JSON}" > /tmp/gcs-key.json
+            gcloud auth activate-service-account --key-file=/tmp/gcs-key.json
+            
+            GCS_PREFIX="${RELEASE_TAG}"
+            
+            echo "--- Uploading assets to gs://${GCS_BUCKET}/${GCS_PREFIX}/"
+            
+            gsutil -m cp "${RELEASE_ASSETS_DIR}"/* "gs://${GCS_BUCKET}/${GCS_PREFIX}/"
+            
+            echo "--- Upload complete. Verifying:"
+            gsutil ls -l "gs://${GCS_BUCKET}/${GCS_PREFIX}/"
+            
+            rm -f /tmp/gcs-key.json
+
+meta:
+  bitrise.io:
+    stack: ubuntu-noble-24.04-bitrise-2025-base
+    machine_type_id: g2.linux.medium