Use semantic versioning branches.

.github/workflows/build-8.x-1.x.yml → .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 8.x branch
+  # Triggers the workflow on push or pull request events but only for the 2.x branch
   push:
-    branches: [ 8.x-1.x, main ]
+    branches: [ 2.x ]
   pull_request:
-    branches: [ 8.x-1.x, main ]
+    branches: [ 2.x ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -88,13 +88,13 @@ 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-8.x-1.x"
+          composer require "islandora/islandora:^2"
           composer require "drupal/search_api_solr:^4.1"
-          composer require "islandora/islandora_defaults:dev-travis-testing as dev-8.x-1.x" --prefer-source -W
+          composer require "islandora/islandora_defaults:dev-github-testing as dev-2.x" --prefer-source -W
 
       - name: Install modules
         run: |

CONTRIBUTING.md

@@ -58,7 +58,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 main, 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/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.
 

README.md

@@ -1,6 +1,6 @@
 # ![Islandora Defaults mascot](https://user-images.githubusercontent.com/2371345/67035035-31828c80-f0ef-11e9-8c46-db902caaaa81.png) 
 # Islandora Defaults    
-[![Build Status](https://github.com/islandora/islandora_defaults/actions/workflows/build-8.x-1.x.yml/badge.svg)](https://github.com/Islandora/islandora_defaults/actions)
+[![Build Status](https://github.com/islandora/islandora_defaults/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/islandora_defaults/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)
 

composer.json

@@ -11,9 +11,9 @@
     "issues": "https://github.com/Islandora/documentation/issues"
   },
   "require": {
-    "islandora/islandora": "dev-8.x-1.x",
-    "islandora/openseadragon" : "dev-8.x-1.x",
-    "islandora/controlled_access_terms" : "dev-8.x-1.x",
+    "islandora/islandora": "^2",
+    "islandora/openseadragon" : "^2",
+    "islandora/controlled_access_terms" : "^2",
     "drupal/field_group" : "^3.0",
     "drupal/field_permissions" : "^1.0",
     "drupal/pdf": "^1.1"