Merge branch 'master' into support_tas_pass_key

Author: AnasNaouchi

.buildkite/pipeline.yml

@@ -0,0 +1,25 @@
+env:
+  AWS_REGION: ap-southeast-1
+  AWS_ROLE_ARN: arn:aws:iam::920252280240:role/S3CDNBucketUploader
+
+  PLUGIN_AWS_ASSUME_ROLE: "ssh://git@github.com/OmisePayments/aws-assume-role-buildkite-plugin.git#v0.2.0"
+
+agents:
+  - "queue=omise-macos-builder"
+
+steps:
+  - label: "Distribute iOS XCFrameworks"
+    if: build.tag != null
+
+    plugins:
+      - ${PLUGIN_AWS_ASSUME_ROLE}:
+          role: ${AWS_ROLE_ARN}
+          region: ${AWS_REGION}
+
+    env:
+      AWS_DOMAIN: "https://cdn.omise.co"
+      WRAPPER_REPO_DIR: "wrapper_repo"
+
+    command: |
+      set -euo pipefail
+      bash .buildkite/scripts/setup_and_distribute_ios.sh

.buildkite/scripts/env.local.example

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+export AWS_ROLE_ARN="arn:aws:iam::123456789012:role/example-role"
+export AWS_REGION="ap-southeast-1"
+export AWS_S3_BUCKET="sample-s3-bucket-name"
+export AWS_DOMAIN="https://cdn-or-s3-domain.example.com"
+export GIT_PAT="ghp_personal_access_token"
+export WRAPPER_REPO="username/wrapper-repo-name"
+export WRAPPER_REPO_DIR="wrapper_repo"
+export FLUTTER_VERSION="3.27.2"

.buildkite/scripts/install_flutter.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FLUTTER_VERSION="${FLUTTER_VERSION:-3.27.2}"
+FLUTTER_SDK_DIR="${HOME}/flutter_sdk_${FLUTTER_VERSION}"
+
+if [[ ! -d "${FLUTTER_SDK_DIR}" ]]; then
+  echo "📦 Installing Flutter ${FLUTTER_VERSION}…"
+  ARCHIVE_URL="https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_${FLUTTER_VERSION}-stable.zip"
+  curl -L -o flutter.zip "${ARCHIVE_URL}"
+  unzip -q flutter.zip -d "${HOME}"
+  mv "${HOME}/flutter" "${FLUTTER_SDK_DIR}"
+  rm -f flutter.zip
+else
+  echo "✅ Flutter ${FLUTTER_VERSION} already installed at ${FLUTTER_SDK_DIR}"
+fi
+
+export PATH="${FLUTTER_SDK_DIR}/bin:${PATH}"
+
+flutter precache --ios

scripts/package.swift.template .buildkite/scripts/package.swift.templatescripts/package.swift.template renamed to .buildkite/scripts/package.swift.template

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export GITHUB_WORKSPACE="$(pwd)"
+source .buildkite/scripts/setup_env.sh
+
+echo "🔍 Extracting version from pubspec.yaml…"
+VERSION=$(grep '^version:' pubspec.yaml | head -1 | sed 's/version: *//')
+export VERSION
+echo "📌 Using version: ${VERSION}"
+
+echo "🚀 Flutter version information:"
+flutter --version
+
+if [[ -d "${WRAPPER_REPO_DIR}" ]]; then
+  echo "ℹ️  Removing existing ${WRAPPER_REPO_DIR} directory…"
+  rm -rf "${WRAPPER_REPO_DIR}"
+fi
+
+echo "🐙 Cloning Swift‑PM wrapper repository…"
+# Set up a temporary git credentials file to avoid exposing the token in process lists
+GIT_CREDENTIALS_FILE=$(mktemp)
+echo "https://x-access-token:${GIT_PAT}@github.com" > "$GIT_CREDENTIALS_FILE"
+git config --global credential.helper "store --file=$GIT_CREDENTIALS_FILE"
+git clone "https://github.com/${WRAPPER_REPO}.git" "${WRAPPER_REPO_DIR}"
+# Clean up credentials after clone
+git config --global --unset credential.helper
+rm -f "$GIT_CREDENTIALS_FILE"
+
+echo "🏗️  Building and distributing XCFrameworks…"
+bash .buildkite/scripts/xc_release.sh
+
+echo "🎉 Distribution complete"

.buildkite/scripts/setup_and_distribute_ios.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+LOCAL_ENV_FILE=".buildkite/scripts/env.local.sh"
+if [[ -f "${LOCAL_ENV_FILE}" ]]; then
+  echo "🔧 Loading local environment overrides from ${LOCAL_ENV_FILE}"
+  # shellcheck disable=SC1090
+  source "${LOCAL_ENV_FILE}"
+fi
+
+export WRAPPER_REPO_DIR="${WRAPPER_REPO_DIR:-wrapper_repo}"
+
+required_vars=(
+  AWS_S3_BUCKET
+  AWS_REGION
+  AWS_DOMAIN
+  GIT_PAT
+  WRAPPER_REPO
+  AWS_ROLE_ARN
+)
+
+for var in "${required_vars[@]}"; do
+  if [[ -z "${!var:-}" ]]; then
+    echo "❌ Environment variable ${var} is not set.  Please set it in your Buildkite configuration or env.local.sh."
+    exit 1
+  fi
+done
+
+echo "🧾 Environment configured!"

.buildkite/scripts/setup_env.sh

@@ -68,7 +68,7 @@ done
 
 # Update SPM
 echo "✍️  Updating Package.swift"
-TEMPLATE="$GITHUB_WORKSPACE/scripts/Package.swift.template"
+TEMPLATE="$GITHUB_WORKSPACE/.buildkite/scripts/Package.swift.template"
 OUTPUT="$GITHUB_WORKSPACE/$WRAPPER_REPO_DIR/Package.swift"
 
 library_targets=$(
@@ -100,6 +100,12 @@ envsubst < "$TEMPLATE" > "$OUTPUT"
 cd "$GITHUB_WORKSPACE/$WRAPPER_REPO_DIR"
 git config user.name  "github-actions"
 git config user.email "actions@github.com"
+
+# Set up git credentials for push operations
+GIT_CREDENTIALS_FILE=$(mktemp)
+echo "https://x-access-token:${GIT_PAT}@github.com" > "$GIT_CREDENTIALS_FILE"
+git config --global credential.helper "store --file=$GIT_CREDENTIALS_FILE"
+
 git add Package.swift
 
 if ! git diff --cached --quiet; then
@@ -112,12 +118,17 @@ if ! git diff --cached --quiet; then
   echo "🏷️  Creating GitHub Release $VERSION"
   # Requires GH CLI authenticated or GITHUB_TOKEN set
   if command -v gh >/dev/null 2>&1; then
-   gh release create "$VERSION" \
-    --title "v$VERSION" \
-    --notes "Automated release for v$VERSION"
+    export GH_TOKEN="$GIT_PAT"
+    gh release create "$VERSION" \
+      --title "v$VERSION" \
+      --notes "Automated release for v$VERSION"
   else
-   echo "⚠️  GitHub CLI (gh) not installed; skipping release creation"
+    echo "⚠️  GitHub CLI (gh) not installed; skipping release creation"
   fi
 else
   echo "ℹ️  No changes in Package.swift; skipping commit/tag."
 fi
+
+# Clean up credentials
+git config --global --unset credential.helper
+rm -f "$GIT_CREDENTIALS_FILE"