Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update branches for semver. #48

Merged
merged 1 commit into from
Oct 5, 2021
Merged

Update branches for semver. #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-dev.yml → .github/workflows/build-2.x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the 7.x branch
push:
branches: [ dev, main ]
branches: [ 2.x ]
pull_request:
branches: [ dev, main ]
branches: [ 2.x ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Crayfish Commons

[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.3-8892BF.svg?style=flat-square)](https://php.net/)
[![Build Status](https://github.com/islandora/crayfish-commons/actions/workflows/build-dev.yml/badge.svg)](https://github.com/Islandora/crayfish-commons/actions)
[![Build Status](https://github.com/islandora/crayfish-commons/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/crayfish-commons/actions)
[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE)
[![codecov](https://codecov.io/gh/Islandora/Crayfish-Commons/branch/dev/graphs/badge.svg?branch=dev)](https://codecov.io/gh/Islandora/Crayfish-Commons)
[![codecov](https://codecov.io/gh/Islandora/Crayfish-Commons/branch/2.x/graphs/badge.svg?branch=2.x)](https://codecov.io/gh/Islandora/Crayfish-Commons)


## Introduction
Expand Down
6 changes: 3 additions & 3 deletions codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
codecov:
# Default branch for CodeCov information
branch: main
branch: 2.x

coverage:
status:
project:
default:
# Only against main
# Only against 2.x
branches:
- main
- 2.x
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"require": {
"doctrine/dbal": "~2.2",
"islandora/chullo": "dev-dev",
"islandora/chullo": "^1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just... noticed that with this change, the composer.lock was left pointing still at the dev-dev branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressing in #50

"monolog/monolog": "^1.22",
"namshi/jose": "^7.2",
"pimple/pimple": "~3.0",
Expand Down