diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a23edb094..a12f808f2 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: push: branches: - - main + - master # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/docs/odk-workflows/EditorsWorkflow.md b/docs/odk-workflows/EditorsWorkflow.md index 2db5b924e..c1466f0d2 100644 --- a/docs/odk-workflows/EditorsWorkflow.md +++ b/docs/odk-workflows/EditorsWorkflow.md @@ -24,7 +24,7 @@ Ensure that there is a ticket on your issue tracker that describes the change yo In your local environment (e.g. your laptop), make sure you are on the `main` (prev. `master`) branch and ensure that you have all the upstream changes, for example: ``` -git checkout main +git checkout master git pull ``` diff --git a/docs/odk-workflows/ManageDocumentation.md b/docs/odk-workflows/ManageDocumentation.md index bb2f1822f..594c04372 100644 --- a/docs/odk-workflows/ManageDocumentation.md +++ b/docs/odk-workflows/ManageDocumentation.md @@ -15,7 +15,7 @@ All the documentation is contained in the `docs` directory, and is managed in _M 1. Open the `.md` file you want to change in an editor of choice (a simple text editor is often best). _IMPORTANT_: Do not edit any files in the `docs/odk-workflows/` directory. These files are managed by the ODK system and will be overwritten when the repository is upgraded! If you wish to change these files, make an issue on the [ODK issue tracker](https://github.com/INCATools/ontology-development-kit/issues). 2. Perform the edit and save the file 3. Commit the file to a branch, and create a pull request as usual. -4. If your development team likes your changes, merge the docs into main branch. +4. If your development team likes your changes, merge the docs into master branch. 5. Deploy the documentation (see below) ## Deploy the documentation diff --git a/docs/odk-workflows/ReleaseWorkflow.md b/docs/odk-workflows/ReleaseWorkflow.md index e0fcc7f19..43cc16d0f 100644 --- a/docs/odk-workflows/ReleaseWorkflow.md +++ b/docs/odk-workflows/ReleaseWorkflow.md @@ -13,8 +13,8 @@ These steps are outlined in detail in the following. Preparation: 1. Ensure that all your pull requests are merged into your main (master) branch -2. Make sure that all changes to main are committed to GitHub (`git status` should say that there are no modified files) -3. Locally make sure you have the latest changes from main (`git pull`) +2. Make sure that all changes to master are committed to GitHub (`git status` should say that there are no modified files) +3. Locally make sure you have the latest changes from master (`git pull`) 4. Checkout a new branch (e.g. `git checkout -b release-2021-01-01`) 5. You may or may not want to refresh your imports as part of your release strategy (see [here](UpdateImports.md)) 6. Make sure you have the latest ODK installed by running `docker pull obolibrary/odkfull` diff --git a/src/ontology/hp-odk.yaml b/src/ontology/hp-odk.yaml index ca285841e..8b1f7726d 100644 --- a/src/ontology/hp-odk.yaml +++ b/src/ontology/hp-odk.yaml @@ -5,6 +5,7 @@ repo: human-phenotype-ontology report_fail_on: none use_dosdps: TRUE dosdp_tools_options: "--obo-prefixes=true --restrict-axioms-to=logical" +git_main_branch: master namespaces: - http://purl.obolibrary.org/obo/HP_ - http://purl.obolibrary.org/obo/hp