Merge branch 'main' into feat/StateMinerInitialPledgeForSector

ChainSafe · Jan 8, 2025 · ba6ebac · ba6ebac
2 parents acf8a8d + e08f599
commit ba6ebac
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -11,14 +11,14 @@ on:
     tags:
       - "*"
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
   merge_group:
   pull_request:
     # This needs to be declared explicitly so that the job is actually
     # run when moved out of draft.
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
 
 env:
   CI: 1

diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml
@@ -11,15 +11,15 @@ on:
       - main
     paths:
       - '**.md'
-      - '/docs'
+      - 'docs/**'
       - '.github/workflows/docs-check.yml'
   merge_group:
   pull_request:
     branches:
       - main
     paths:
       - '**.md'
-      - '/docs'
+      - 'docs/**'
       - '.github/workflows/docs-check.yml'
 
 jobs:

diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
@@ -5,14 +5,14 @@ on:
     branches:
       - main
     paths:
-      - '/docs'
+      - 'docs/**'
       - '.github/workflows/docs-deploy.yml'
   merge_group:
   pull_request:
     branches:
       - main
     paths:
-      - '/docs'
+      - 'docs/**'
       - '.github/workflows/docs-deploy.yml'
 
 permissions:
@@ -44,4 +44,4 @@ jobs:
           apiToken: ${{ secrets.CLOUDFLARE_PAGES_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_PAGES_ACCOUNT_ID }}
           command: pages deploy ./docs/build --project-name=forest-docs
-          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/forest.yml b/.github/workflows/forest.yml
@@ -9,12 +9,12 @@ concurrency:
     branches:
       - main
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
   push:
     branches:
       - main
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
   schedule:
     - cron: 0 0 * * *
 env:
@@ -491,7 +491,7 @@ jobs:
           name: 'forest-${{ runner.os }}'
       - name: Run api compare tests
         run: ./scripts/tests/api_compare/setup.sh
-        timeout-minutes: 120 # '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
+        timeout-minutes: '${{ fromJSON(env.SCRIPT_TIMEOUT_MINUTES) }}'
       - name: Dump docker logs
         if: always()
         uses: jwalton/gh-docker-logs@v2

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,12 +15,12 @@ on:
     # run when moved out of draft.
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
   push:
     branches:
       - main
     paths-ignore:
-      - 'docs/'
+      - 'docs/**'
   schedule:
     - cron: "0 0 * * *"