diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-1.x.yml similarity index 95% rename from .github/workflows/build-dev.yml rename to .github/workflows/build-1.x.yml index 8697c35f..0b1ed759 100644 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-1.x.yml @@ -2,9 +2,9 @@ name: CI on: push: - braches: [dev, main ] + braches: [1.x] pull_request: - branches: [dev, main ] + branches: [1.x] jobs: build: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40946f8f..504f0dd2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,10 @@ # Welcome! -If you are reading this document then you are interested in contributing to Islandora 8. All contributions are welcome: use-cases, documentation, code, patches, bug reports, feature requests, etc. You do not need to be a programmer to speak up! +If you are reading this document then you are interested in contributing to Islandora. All contributions are welcome: use-cases, documentation, code, patches, bug reports, feature requests, etc. You do not need to be a programmer to speak up! ## Workflows -The Islandora 8 Tech Call meets each Wednesday at 1:00 PM Eastern, and the Islandora 8 User Call meets every second Thursday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora/documentation/wiki#islandora-8-tech-calls). Anybody is welcome to join the calls, and add items to the agenda. +The Islandora Tech Call meets each Wednesday at 1:00 PM Eastern, and the Islandora User Call meets every second Thursday at 1:00 PM Eastern. Meeting notes and announcements are posted to the [Islandora community list](https://groups.google.com/forum/#!forum/islandora) and the [Islandora developers list](https://groups.google.com/forum/#!forum/islandora-dev). You can view meeting agendas, notes, and call-in information [here](https://github.com/Islandora/documentation/wiki#islandora-8-tech-calls). Anybody is welcome to join the calls, and add items to the agenda. ### Use cases @@ -12,15 +12,15 @@ If you would like to submit a use case to the Islandora 8 project, please submit ### Documentation -You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/master/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/master/docs). +You can contribute documentation in two different ways. One way is to create an issue [here](https://github.com/Islandora/documentation/issues/new), prepending "Documentation:" to the title of the issue. Another way is by pull request, which is the same process as [Contribute Code](https://github.com/Islandora/documentation/blob/main/CONTRIBUTING.md#contribute-code). All documentation resides in [`docs`](https://github.com/Islandora/documentation/tree/main/docs). ### Request a new feature -To request a new feature you should [open an issue in the Islandora 8 repository](https://github.com/Islandora/documentation/issues/new) or create a use case (see the _Use cases_ section above), and summarize the desired functionality. Prepend "Enhancement:" if creating an issue on the project repo, and "Use Case:" if creating a use case. +To request a new feature you should [open an issue in the Islandora repository](https://github.com/Islandora/documentation/issues/new) or create a use case (see the _Use cases_ section above), and summarize the desired functionality. Prepend "Enhancement:" if creating an issue on the project repo, and "Use Case:" if creating a use case. ### Report a bug -To report a bug you should [open an issue in the Islandora 8 repository](https://github.com/Islandora/documentation/issues/new) that summarizes the bug. Prepend the label "Bug:" to the title of the issue. +To report a bug you should [open an issue in the Islandora repository](https://github.com/Islandora/documentation/issues/new) that summarizes the bug. Prepend the label "Bug:" to the title of the issue. In order to help us understand and fix the bug it would be great if you could provide us with: @@ -40,7 +40,7 @@ Before you set out to contribute code you will need to have completed a [Contrib _If you are interested in contributing code to Islandora but do not know where to begin:_ -In this case you should [browse open issues](https://github.com/Islandora/documentation/issues) and check out [use cases](https://github.com/Islandora/documentation/labels/use%20case). +In this case you should [browse open issues](https://github.com/Islandora/documentation/issues) and check out [Type: use cases](https://github.com/Islandora/documentation/labels/Type%3A%20use%20case). If you are contributing Drupal code, it must adhere to [Drupal Coding Standards](https://www.drupal.org/coding-standards); Travis CI will check for this on pull requests. @@ -58,9 +58,9 @@ Contributions to the Islandora codebase should be sent as GitHub pull requests. Take a look at [Creating a pull request](https://help.github.com/articles/creating-a-pull-request). In a nutshell you need to: -1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off master, or for Drupal modules use the most recent version branch). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions. +1. [Fork](https://help.github.com/articles/fork-a-repo) this repository to your personal or institutional GitHub account (depending on the CLA you are working under). Be cautious of which branches you work from though (you'll want to base your work off the default branch for that repository). See [Fork a repo](https://help.github.com/articles/fork-a-repo) for detailed instructions. 2. Commit any changes to your fork. -3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/master/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from. +3. Send a [pull request](https://help.github.com/articles/creating-a-pull-request) using the [pull request template](https://github.com/Islandora/documentation/blob/main/.github/PULL_REQUEST_TEMPLATE.md) to the Islandora GitHub repository that you forked in step 1. If your pull request is related to an existing issue -- for instance, because you reported a [bug/issue](https://github.com/Islandora/documentation/issues) earlier -- prefix the title of your pull request with the corresponding issue number (e.g. `issue-123: ...`). Please also include a reference to the issue in the description of the pull. This can be done by using '#' plus the issue number like so '#123', also try to pick an appropriate name for the branch in which you're issuing the pull request from. You may want to read [Syncing a fork](https://help.github.com/articles/syncing-a-fork) for instructions on how to keep your fork up to date with the latest changes of the upstream (official) repository. diff --git a/README.md b/README.md index ee763ac4..4876220e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # ![Alpaca](https://cloud.githubusercontent.com/assets/2371345/15409648/16c140b4-1dec-11e6-81d9-41929bc83b1f.png) Alpaca -[![Build Status](https://github.com/islandora/Alpaca/actions/workflows/build-dev.yml/badge.svg)](https://github.com/Islandora/Alpaca/actions) +[![Build Status](https://github.com/islandora/Alpaca/actions/workflows/build-1.x.yml/badge.svg)](https://github.com/Islandora/Alpaca/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/Alpaca/branch/master/graphs/badge.svg)](https://codecov.io/gh/Islandora/Alpaca) +[![codecov](https://codecov.io/gh/Islandora/Alpaca/branch/1.x/graphs/badge.svg)](https://codecov.io/gh/Islandora/Alpaca) ## Introduction @@ -44,7 +44,7 @@ If you would like to contribute, please get involved by attending our weekly [Te If you would like to contribute code to the project, you need to be covered by an Islandora Foundation [Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_cla.pdf) or [Corporate Contributor License Agreement](http://islandora.ca/sites/default/files/islandora_ccla.pdf). Please see the [Contributors](http://islandora.ca/resources/contributors) pages on Islandora.ca for more information. -We recommend using the [islandora-playbook](https://github.com/Islandora-Devops/islandora-playbook) to get started. +We recommend using the [islandora-playbook](https://github.com/Islandora-Devops/islandora-playbook) to get started. ## Licensing [MIT](/License) diff --git a/build.gradle b/build.gradle index 10a49ebb..509390af 100644 --- a/build.gradle +++ b/build.gradle @@ -151,7 +151,7 @@ subprojects { packaging 'jar' url project.homepage inceptionYear project.inceptionYear - name 'Islandora 2.0.0 :: Alpaca' + name 'Islandora :: Alpaca' description 'Event driven middleware based on Apache Camel that synchronizes a Fedora 4 with Drupal.' organization { diff --git a/codecov.yml b/codecov.yml index 8a2ea0c8..531d957d 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,11 +1,10 @@ codecov: # Default branch for CodeCov information - branch: master + branch: 1.x coverage: status: project: default: - # Only against master branches: - - master + - 1.x