Skip to content

Commit

Permalink
Merge pull request #621 from City-of-Helsinki/UHF-9113-v4-branch
Browse files Browse the repository at this point in the history
UHF-9113: sync changes from main to v4 branch
  • Loading branch information
hyrsky authored Oct 23, 2023
2 parents d00e9e6 + 7e2f463 commit 6f7082c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/v4-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: v4 sync

on:
push:
branches: [ "main" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: '4.x'

- name: Rebase 4.x branch
run: |
# Set git user from the latest commit
git config user.name "$(git --no-pager log --format=format:'%an' -n 1)"
git config user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
git rebase origin/main
git push --force
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"minimum-stability": "dev",
"require": {
"ext-curl": "*",
"drupal/core": "^9.5",
"drupal/admin_toolbar": "^3.0",
"drupal/allowed_formats": "^2.0",
"drupal/config_ignore": "^2.3",
Expand Down

0 comments on commit 6f7082c

Please sign in to comment.