Skip to content

Commit

Permalink
Merge branch 'develop' into feature/updates
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/dependabot.yml
  • Loading branch information
joelvaneenwyk committed May 18, 2024
2 parents e8e868d + 577afee commit bd3c3a3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
11 changes: 5 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for more information:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://containers.dev/guide/dependabot

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"

- package-ecosystem: "devcontainers"
directory: "/"
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit bd3c3a3

Please sign in to comment.