fix

ns-vasilev · ns-vasilev · commit ae2e5ae32c2d · 2025-11-25T09:41:42.000+04:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,4 +1,3 @@
-# .github/workflows/deploy-docc.yml
 name: Deploy DocC Documentation
 
 on:
@@ -9,44 +8,61 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: write
+  contents: read
   pages: write
   id-token: write
-  actions: read
 
 concurrency:
   group: "pages"
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
-  build-and-deploy:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: latest-stable
       
-      - name: Get repository name
-        id: repo-name
-        run: echo "REPO_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_OUTPUT
-      
-      - name: Build DocC Documentation
-        uses: ./.github/actions/build-docc
-        with:
-          products: 'ValidatorCore,ValidatorUI'
-          docc-paths: 'Sources/ValidatorCore/Validator.docc,Sources/ValidatorUI/ValidatorUI.docc'
-          bundle-identifier-prefix: 'dev.validator'
-          bundle-version: '1.0.0'
-          platforms: 'iOS,macOS,watchOS,tvOS,visionOS'
-          output-path: './docs'
-          hosting-base-path: '${{ steps.repo-name.outputs.REPO_NAME }}'
-      
-      - name: Create Index Page
+      - name: Build DocC
         run: |
+          swift package resolve
+          
+          # Build ValidatorCore documentation
+          echo "Building ValidatorCore documentation..."
+          xcodebuild docbuild \
+            -scheme ValidatorCore \
+            -derivedDataPath /tmp/docbuild \
+            -destination 'generic/platform=iOS'
+          
+          $(xcrun --find docc) process-archive \
+            transform-for-static-hosting /tmp/docbuild/Build/Products/Debug-iphoneos/ValidatorCore.doccarchive \
+            --output-path docs/ValidatorCore \
+            --hosting-base-path 'validator/ValidatorCore'
+          
+          # Build ValidatorUI documentation
+          echo "Building ValidatorUI documentation..."
+          xcodebuild docbuild \
+            -scheme ValidatorUI \
+            -derivedDataPath /tmp/docbuild \
+            -destination 'generic/platform=iOS'
+          
+          $(xcrun --find docc) process-archive \
+            transform-for-static-hosting /tmp/docbuild/Build/Products/Debug-iphoneos/ValidatorUI.doccarchive \
+            --output-path docs/ValidatorUI \
+            --hosting-base-path 'validator/ValidatorUI'
+          
+          # Create index page with module selection
           cat > docs/index.html << 'EOF'
           <!DOCTYPE html>
           <html lang="en">
@@ -186,14 +202,14 @@ jobs:
                   </header>
                   
                   <div class="docs-grid">
-                      <a href="ValidatorCore/documentation/validatorcore/" class="doc-card">
+                      <a href="ValidatorCore/documentation/validatorcore" class="doc-card">
                           <span class="module-badge">Core Module</span>
                           <h2>ValidatorCore</h2>
                           <p>Core validation functionality and rules for Swift applications. Contains base types, protocols, and validator implementations.</p>
                           <span class="link">View documentation</span>
                       </a>
                       
-                      <a href="ValidatorUI/documentation/validatorui/" class="doc-card">
+                      <a href="ValidatorUI/documentation/validatorui" class="doc-card">
                           <span class="module-badge">UI Module</span>
                           <h2>ValidatorUI</h2>
                           <p>UI components and helpers for building validation interfaces. Ready-to-use solutions for SwiftUI and UIKit.</p>
@@ -209,10 +225,11 @@ jobs:
           </html>
           EOF
       
-      - name: Deploy to gh-pages
-        uses: peaceiris/actions-gh-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs
-          publish_branch: gh-pages
-          force_orphan: true
+          path: 'docs'
+      
+      - id: deployment
+        name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v4
