From 4b9493210ecf7e5e42ec717c8af8608933d82bd4 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 5 Oct 2021 17:09:42 -0300 Subject: [PATCH] Start fixing branches to semver. --- .github/workflows/{build-8.x-1.x.yml => build-2.x.yml} | 10 +++++----- CONTRIBUTING.md | 2 +- README.md | 4 ++-- composer.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename .github/workflows/{build-8.x-1.x.yml => build-2.x.yml} (93%) diff --git a/.github/workflows/build-8.x-1.x.yml b/.github/workflows/build-2.x.yml similarity index 93% rename from .github/workflows/build-8.x-1.x.yml rename to .github/workflows/build-2.x.yml index 99e69571..306278ba 100644 --- a/.github/workflows/build-8.x-1.x.yml +++ b/.github/workflows/build-2.x.yml @@ -4,11 +4,11 @@ name: CI # Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the 7.x branch + # Triggers the workflow on push or pull request events but only for the 2.x branch push: - branches: [ 8.x-1.x ] + branches: [ 2.x ] pull_request: - branches: [ 8.x-1.x ] + branches: [ 2.x ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -91,11 +91,11 @@ jobs: - name: Setup composer paths run: | - git -C "$GITHUB_WORKSPACE/build_dir" checkout -b travis-testing + git -C "$GITHUB_WORKSPACE/build_dir" checkout -b github-testing cd $DRUPAL_DIR composer config repositories.local path "$GITHUB_WORKSPACE/build_dir" composer config minimum-stability dev - composer require "islandora/islandora:dev-travis-testing as dev-8.x-1.x" + composer require "islandora/islandora:dev-github-testing as dev-2.x" - name: Install modules run: | diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1bb5a546..19b59fd4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,7 +62,7 @@ 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). 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. diff --git a/README.md b/README.md index 0de74252..c085764d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # ![Islandora](https://cloud.githubusercontent.com/assets/2371345/25624809/f95b0972-2f30-11e7-8992-a8f135402cdc.png) Islandora [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.2-8892BF.svg?style=flat-square)](https://php.net/) -[![Build Status](https://github.com/islandora/islandora/actions/workflows/build-8.x-1.x.yml/badge.svg)](https://github.com/Islandora/islandora/actions) +[![Build Status](https://github.com/islandora/islandora/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/islandora/actions) [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md) [![LICENSE](https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square)](./LICENSE) -[![codecov](https://codecov.io/gh/Islandora/islandora/branch/8.x-1.x/graph/badge.svg)](https://codecov.io/gh/Islandora/islandora) +[![codecov](https://codecov.io/gh/Islandora/islandora/branch/2.x/graph/badge.svg)](https://codecov.io/gh/Islandora/islandora) ## Introduction diff --git a/composer.json b/composer.json index edd148d2..f787f94a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "drupal/context": "^4.0@beta", "drupal/search_api": "~1.8", - "islandora/jsonld": "dev-8.x-1.x", + "islandora/jsonld": "^2", "stomp-php/stomp-php": "4.*", "drupal/jwt": "^1.0.0-beta5", "drupal/filehash": "^1.1", @@ -28,7 +28,7 @@ "drupal/migrate_source_csv" : "^3.4", "drupal/token" : "^1.3", "drupal/flysystem" : "^2.0@alpha", - "islandora/crayfish-commons": "dev-dev", + "islandora/crayfish-commons": "^2", "drupal/file_replace": "^1.1" },