Skip to content

Commit

Permalink
Merge branch 'dev' into issue-267
Browse files Browse the repository at this point in the history
  • Loading branch information
greatislander authored Jan 12, 2024
2 parents 10edbdb + b0f9079 commit bc7e897
Show file tree
Hide file tree
Showing 5 changed files with 987 additions and 702 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: npm
directory: /
schedule:
interval: monthly
allow:
- dependency-type: direct
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
6 changes: 3 additions & 3 deletions .github/workflows/ensure-cms-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
env:
target_branch: "dev" # Default to dev branch
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Adjust target branch for environment
if: endsWith(github.ref, '/main') # If the commit is in
run: |
echo "target_branch=main" >> $GITHUB_ENV
- name: Update CMS branch configuration
uses: mikefarah/yq@v4.6.3
uses: mikefarah/yq@v4.40.5
with:
cmd: yq eval -i '.backend.branch = "${{ env.target_branch }}"' src/admin/config.yml
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "chore: update CMS branch configuration"
file_pattern: src/admin/config.yml
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
Expand Down
Loading

0 comments on commit bc7e897

Please sign in to comment.