Merge pull request #73 from seth-shaw-unlv/2.x

Changing the base branch to 2.x

.github/workflows/build-8.x-1.x.yml → .github/workflows/build-2.x.yml

@@ -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: [ 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:
@@ -87,11 +87,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/controlled_access_terms:dev-travis-testing as dev-8.x-1.x"
+          composer require "islandora/controlled_access_terms:dev-github-testing as dev-2.x"
 
       - name: Install modules
         run: |
@@ -105,4 +105,3 @@ jobs:
         run: |
           cd $DRUPAL_DIR/web/core
           php scripts/run-tests.sh --suppress-deprecations --url http://127.0.0.1:8282 --verbose --php `which php` --module "controlled_access_terms"
-

README.md

@@ -12,7 +12,7 @@ subject terms.
 
 It is intended to be used in conjunction with both the [ArchivesSpace/Drupal 8
 Integration project](https://github.com/UNLV-Libraries/archivesspace-drupal) and
-[Islandora 8](https://github.com/Islandora/islandora/tree/8.x-1.x).
+[Islandora 8](https://github.com/Islandora/islandora/tree/2.x).
 
 
 ## Requirements
@@ -117,7 +117,7 @@ displayed. The default setting is YYYY-MM-DD (e.g. 1900-01-31) but settings
 can change, for example, the separator and the date order to display dates in
 'mm/dd/yyyy' format (e.g. 01/31/1900).
 
-[1]: https://github.com/islandora/controlled_access_terms/actions/workflows/build-8.x-1.x.yml/badge.svg
+[1]: https://github.com/islandora/controlled_access_terms/actions/workflows/build-2.x.yml/badge.svg
 [2]: http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg
 [3]: https://img.shields.io/badge/license-GPLv2-blue.svg?style=flat-square