Skip to content

Commit b6e00f4

Browse files
authored
Update base branch for actions (matomo-org#19943)
1 parent 128ac73 commit b6e00f4

6 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/composer-update.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v2
2727
with:
28-
ref: '4.x-dev'
28+
ref: '5.x-dev'
2929
lfs: false
3030
- name: Install composer dependencies
3131
run: composer install
@@ -48,8 +48,8 @@ jobs:
4848
4949
git push origin --delete composer-update || true
5050
git branch -D composer-update || true
51-
git fetch upstream 4.x-dev
52-
git checkout -f upstream/4.x-dev
51+
git fetch upstream 5.x-dev
52+
git checkout -f upstream/5.x-dev
5353
git branch composer-update
5454
git checkout -f composer-update
5555
- name: Update composer dependencies
@@ -88,7 +88,7 @@ jobs:
8888
"title":"[automatic composer updates]",
8989
"body":${{ steps.update.outputs.message }},
9090
"head":"composer-update",
91-
"base":"4.x-dev"
91+
"base":"5.x-dev"
9292
}' \
9393
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
9494
shell: bash

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
100100
if ! [[ ${GITHUB_REF#refs/heads/} =~ ^[4-9]\.x-dev$ || ${GITHUB_REF#refs/heads/} == "next_release" ]]
101101
then
102-
echo "A tag can only be created from branches '4.x-dev' and 'next_release'. Please create the tag manually if a release needs to be built from another branch."
102+
echo "A tag can only be created from branches '5.x-dev' and 'next_release'. Please create the tag manually if a release needs to be built from another branch."
103103
exit 1
104104
fi
105105

.github/workflows/submodules.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v2
2727
with:
28-
ref: '4.x-dev'
28+
ref: '5.x-dev'
2929
lfs: false
3030
- name: Prepare branches
3131
run: |
@@ -46,14 +46,14 @@ jobs:
4646
4747
git push origin --delete submodules || true
4848
git branch -D submodules || true
49-
git fetch upstream 4.x-dev
50-
git checkout -f upstream/4.x-dev
49+
git fetch upstream 5.x-dev
50+
git checkout -f upstream/5.x-dev
5151
git branch submodules
5252
git checkout -f submodules
5353
- name: Checkout submodules
5454
run: git submodule update --init --force
5555
- name: Update all submodules
56-
run: git submodule foreach "git checkout 4.x-dev || git checkout master; git pull --ff-only"
56+
run: git submodule foreach "git checkout 5.x-dev || git checkout master; git pull --ff-only"
5757
- name: Check for changes
5858
id: changes
5959
continue-on-error: true
@@ -95,7 +95,7 @@ jobs:
9595
"title":"[automatic submodule updates]",
9696
"body":"${{ steps.changes.outputs.message }}",
9797
"head":"submodules",
98-
"base":"4.x-dev"
98+
"base":"5.x-dev"
9999
}' \
100100
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
101101
shell: bash

.github/workflows/update-intl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
"title":"[automatic Intl data updates from CLDR ${{ steps.cldr.outputs.cldr-version }}]",
116116
"body":"Updated Intl plugin data with changes from CLDR ${{ steps.cldr.outputs.cldr-version }}",
117117
"head":"update-intl",
118-
"base":"4.x-dev"
118+
"base":"5.x-dev"
119119
}' \
120120
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
121121
shell: bash

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## Code Status
88

9-
[![Build Status](https://travis-ci.com/matomo-org/matomo.svg?branch=4.x-dev)](https://app.travis-ci.com/matomo-org/matomo/branches)
9+
[![Build Status](https://travis-ci.com/matomo-org/matomo.svg?branch=5.x-dev)](https://app.travis-ci.com/matomo-org/matomo/branches)
1010
[![Percentage of issues still open](http://isitmaintained.com/badge/open/matomo-org/matomo.svg)](http://isitmaintained.com/project/matomo-org/matomo "Percentage of issues still open")
1111

1212
## Description

libs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Legal notice
22

3-
See the [LEGALNOTICE file](https://github.com/matomo-org/matomo/blob/4.x-dev/LEGALNOTICE).
3+
See the [LEGALNOTICE file](https://github.com/matomo-org/matomo/blob/5.x-dev/LEGALNOTICE).
44

55
## Matomo modifications to libs/
66

0 commit comments

Comments
 (0)