Merge branch 'develop' into dependabot/github_actions/peaceiris/actio…

…ns-gh-pages-4
joelvaneenwyk · Jun 11, 2024 · b94a17a · b94a17a
2 parents 0b8a47b + 577afee
commit b94a17a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,9 @@ name: build
 
 on:
    push:
-      branches: [master]
+      branches: [main, develop]
    pull_request:
-      branches: [master]
+      branches: [main, develop]
 
 env:
    CARGO_TERM_COLOR: always

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -1,21 +1,24 @@
 name: Build and deploy Github pages
 on:
     push:
-        branches:
-            - master
+        branches: [develop]
         paths:
             - "docs/**"
             - "gen-docs.ts"
             - "crates/eww/src/widgets/widget_definitions.rs"
             - "crates/eww/src/config/inbuilt.rs"
             - ".github/workflows/**"
+
 jobs:
     build:
         name: Build mdBook
         runs-on: ubuntu-latest
         steps:
             # Checkout
-            - uses: actions/checkout@master
+            - uses: actions/checkout@v4
+              with:
+                submodules: recursive
+                fetch-depth: 0
 
             # Build widget documentation
             - name: Use deno to build widget documentation