Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2022-11-07 16:33:37 +0300
committerGitHub <noreply@github.com>2022-11-07 16:33:37 +0300
commitb6e00f4035f236dc96563d1fecb0daec9f8410d8 (patch)
treec46a5bd222db10dde3679d20ab3df06622b275e6
parent128ac73ce5047565122a715e1ebcecb0a4e90ea4 (diff)
Update base branch for actions (#19943)
-rw-r--r--.github/workflows/composer-update.yml8
-rw-r--r--.github/workflows/release.yml2
-rw-r--r--.github/workflows/submodules.yml10
-rw-r--r--.github/workflows/update-intl.yml2
-rw-r--r--README.md2
-rw-r--r--libs/README.md2
6 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml
index a16d9e92d7..60f5669ec5 100644
--- a/.github/workflows/composer-update.yml
+++ b/.github/workflows/composer-update.yml
@@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
- ref: '4.x-dev'
+ ref: '5.x-dev'
lfs: false
- name: Install composer dependencies
run: composer install
@@ -48,8 +48,8 @@ jobs:
git push origin --delete composer-update || true
git branch -D composer-update || true
- git fetch upstream 4.x-dev
- git checkout -f upstream/4.x-dev
+ git fetch upstream 5.x-dev
+ git checkout -f upstream/5.x-dev
git branch composer-update
git checkout -f composer-update
- name: Update composer dependencies
@@ -88,7 +88,7 @@ jobs:
"title":"[automatic composer updates]",
"body":${{ steps.update.outputs.message }},
"head":"composer-update",
- "base":"4.x-dev"
+ "base":"5.x-dev"
}' \
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
shell: bash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 179d1d47dc..b040043528 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -99,7 +99,7 @@ jobs:
if ! [[ ${GITHUB_REF#refs/heads/} =~ ^[4-9]\.x-dev$ || ${GITHUB_REF#refs/heads/} == "next_release" ]]
then
- 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."
+ 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."
exit 1
fi
diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml
index 5a3ad7b90b..ca58320200 100644
--- a/.github/workflows/submodules.yml
+++ b/.github/workflows/submodules.yml
@@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
- ref: '4.x-dev'
+ ref: '5.x-dev'
lfs: false
- name: Prepare branches
run: |
@@ -46,14 +46,14 @@ jobs:
git push origin --delete submodules || true
git branch -D submodules || true
- git fetch upstream 4.x-dev
- git checkout -f upstream/4.x-dev
+ git fetch upstream 5.x-dev
+ git checkout -f upstream/5.x-dev
git branch submodules
git checkout -f submodules
- name: Checkout submodules
run: git submodule update --init --force
- name: Update all submodules
- run: git submodule foreach "git checkout 4.x-dev || git checkout master; git pull --ff-only"
+ run: git submodule foreach "git checkout 5.x-dev || git checkout master; git pull --ff-only"
- name: Check for changes
id: changes
continue-on-error: true
@@ -95,7 +95,7 @@ jobs:
"title":"[automatic submodule updates]",
"body":"${{ steps.changes.outputs.message }}",
"head":"submodules",
- "base":"4.x-dev"
+ "base":"5.x-dev"
}' \
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
shell: bash
diff --git a/.github/workflows/update-intl.yml b/.github/workflows/update-intl.yml
index b6249c9edf..82fe0a50ad 100644
--- a/.github/workflows/update-intl.yml
+++ b/.github/workflows/update-intl.yml
@@ -115,7 +115,7 @@ jobs:
"title":"[automatic Intl data updates from CLDR ${{ steps.cldr.outputs.cldr-version }}]",
"body":"Updated Intl plugin data with changes from CLDR ${{ steps.cldr.outputs.cldr-version }}",
"head":"update-intl",
- "base":"4.x-dev"
+ "base":"5.x-dev"
}' \
--url https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls
shell: bash
diff --git a/README.md b/README.md
index ca1ce8baa0..a8c99965b3 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
## Code Status
-[![Build Status](https://travis-ci.com/matomo-org/matomo.svg?branch=4.x-dev)](https://app.travis-ci.com/matomo-org/matomo/branches)
+[![Build Status](https://travis-ci.com/matomo-org/matomo.svg?branch=5.x-dev)](https://app.travis-ci.com/matomo-org/matomo/branches)
[![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")
## Description
diff --git a/libs/README.md b/libs/README.md
index 8e911a9e72..6f2c0bae88 100644
--- a/libs/README.md
+++ b/libs/README.md
@@ -1,6 +1,6 @@
## Legal notice
-See the [LEGALNOTICE file](https://github.com/matomo-org/matomo/blob/4.x-dev/LEGALNOTICE).
+See the [LEGALNOTICE file](https://github.com/matomo-org/matomo/blob/5.x-dev/LEGALNOTICE).
## Matomo modifications to libs/