Skip to content

Commit

Permalink
Change default branch to 2.x (#59)
Browse files Browse the repository at this point in the history
* Change default branch to 2.x

* Fix broken github actions

* ditch main branch testing
  • Loading branch information
seth-shaw-unlv authored Oct 5, 2021
1 parent 7f16912 commit 52a939c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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 8.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 @@ -88,11 +88,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/jsonld:dev-travis-testing as dev-8.x-1.x" --prefer-source -W
composer require "islandora/jsonld:dev-github-testing as dev-2.x" --prefer-source -W
- name: Install modules
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ an Islandora Foundation [Contributor License Agreement][6] or

[GPLv2](http://www.gnu.org/licenses/gpl-2.0.txt)

[1]: https://github.com/islandora/jsonld/actions/workflows/build-8.x-1.x.yml/badge.svg
[1]: https://github.com/islandora/jsonld/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
[4]: https://github.com/whikloj
Expand Down

0 comments on commit 52a939c

Please sign in to comment.