From 6f5b72ffdba9b0cfc612c24fdcf2e48b1e661bf3 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 22 Jan 2025 18:03:37 +0100
Subject: [PATCH] Deploy DocC docs from Ubuntu workflow (#3170)

---
 .github/workflows/gh-pages-docc.yml | 74 +++++++++++++++++++++++++++++
 .github/workflows/ios-ci.yml        | 10 ----
 platform/windows/vendor/vcpkg       |  2 +-
 3 files changed, 75 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/gh-pages-docc.yml

diff --git a/.github/workflows/gh-pages-docc.yml b/.github/workflows/gh-pages-docc.yml
new file mode 100644
index 000000000..d02221794
--- /dev/null
+++ b/.github/workflows/gh-pages-docc.yml
@@ -0,0 +1,74 @@
+name: gh-pages-docc
+
+permissions:
+  id-token: write
+  pages: write
+  contents: write
+
+on:
+  workflow_dispatch:
+  workflow_run:
+    workflows:
+      - ios-ci
+    types:
+      - completed
+
+jobs:
+  gh-pages-docc-build:
+    if: ${{ github.ref_name == 'main' }}
+    name: Build DocC Docs
+    runs-on: macos-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-west-2
+          role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
+          role-session-name: ${{ github.run_id }}
+
+      - name: Build DocC documentation
+        working-directory: .
+        run: |
+          HOSTING_BASE_PATH="maplibre-native/ios/latest" platform/ios/scripts/docc.sh
+
+      # workaround since colons in filenames are not allowed in artifacts
+      # https://github.com/actions/upload-artifact/issues/333
+      - name: Create ZIP archive
+        run: |
+          cd build
+          zip -r docs.zip docs/
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: docc-docs
+          path: build/docs.zip
+
+  gh-pages-docc-deploy:
+    needs: gh-pages-docc-build
+    name: Deploy DocC Docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Download DocC docs artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: docc-docs
+          path: build
+
+      - name: Unzip documentation
+        run: |
+          cd build
+          unzip docs.zip
+          rm docs.zip
+
+      - name: Deploy DocC documentation (main) 🚀
+        uses: JamesIves/github-pages-deploy-action@v4.7.2
+        with:
+          branch: gh-pages
+          folder: build/docs
+          target-folder: ios/latest/
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index f848c49ea..afd21f42f 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -29,7 +29,6 @@ on:
 permissions:
   id-token: write         # needed for AWS
   contents: write         # allow making a release
-  pages: write
 
 jobs:
   pre_job:
@@ -200,15 +199,6 @@ jobs:
         run: |
           HOSTING_BASE_PATH="maplibre-native/ios/latest" platform/ios/scripts/docc.sh
 
-      - name: Deploy DocC documentation (main) 🚀
-        if: github.ref == 'refs/heads/main'
-        uses: JamesIves/github-pages-deploy-action@v4.7.2
-        continue-on-error: true
-        with:
-          branch: gh-pages
-          folder: build/docs
-          target-folder: ios/latest/
-
   ios-release:
     runs-on: macos-14
     needs: ios-build
diff --git a/platform/windows/vendor/vcpkg b/platform/windows/vendor/vcpkg
index 6f29f12e8..db4924694 160000
--- a/platform/windows/vendor/vcpkg
+++ b/platform/windows/vendor/vcpkg
@@ -1 +1 @@
-Subproject commit 6f29f12e82a8293156836ad81cc9bf5af41fe836
+Subproject commit db4924694eabc161a7fb8eb43f083d0ca55396e2