From 6ffd8108efb18df6575e10cd0ab3362264988933 Mon Sep 17 00:00:00 2001 From: "B. Seeger" Date: Tue, 5 Oct 2021 14:44:20 -0400 Subject: [PATCH] Updates things to use 2.x branch (#38) * Updates things to use 2.x branch * Change travis-testing branch to test * removing travis and fixing / reverting --- .github/workflows/{build-8.x-1.x.yml => build-2.x.yml} | 8 ++++---- README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 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 ef7bc1e..e91a81e 100644 --- a/.github/workflows/build-8.x-1.x.yml +++ b/.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/openseadragon:dev-travis-testing as dev-8.x-1.x" + composer require "islandora/openseadragon:dev-github-testing as dev-2.x" - name: Install modules run: | diff --git a/README.md b/README.md index bb9ffee..dc32ee6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ![Mascot](https://user-images.githubusercontent.com/5439169/65790675-0242b600-e115-11e9-817f-e31c41bf2ece.png) OpenSeadragon -[![Build Status](https://github.com/islandora/openseadragon/actions/workflows/build-8.x-1.x.yml/badge.svg)](https://github.com/Islandora/openseadragon/actions) +[![Build Status](https://github.com/islandora/openseadragon/actions/workflows/build-2.x.yml/badge.svg)](https://github.com/Islandora/openseadragon/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) @@ -14,7 +14,7 @@ Drupal 8 FieldFormatter to display an image or generic file using a IIIF Image s ## Installation This module can be installed via composer and enabled via Drush, like: -1. `composer require islandora/openseadragon:dev-8.x-1.x` +1. `composer require islandora/openseadragon:dev-2.x` 1. `drush pm-en openseadragon` Downloading/deploying the openseadragon library itself is not neccessary, as it is referenced externally via a CDN.