Skip to content

Commit

Permalink
Updates things to use 2.x branch (#38)
Browse files Browse the repository at this point in the history
* Updates things to use 2.x branch

* Change travis-testing branch to test

* removing travis and fixing / reverting
  • Loading branch information
bseeger authored Oct 5, 2021
1 parent 5f847e5 commit 6ffd810
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ![Mascot](https://user-images.githubusercontent.com/5439169/65790675-0242b600-e115-11e9-817f-e31c41bf2ece.png) OpenSeadragon
[![Build Status](https:/islandora/openseadragon/actions/workflows/build-8.x-1.x.yml/badge.svg)](https:/Islandora/openseadragon/actions)
[![Build Status](https:/islandora/openseadragon/actions/workflows/build-2.x.yml/badge.svg)](https:/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)

Expand All @@ -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.
Expand Down

0 comments on commit 6ffd810

Please sign in to comment.