Skip to content

switch workflow branches from 2.1 feature branches to main/master #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lizkrznarich wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

switch workflow branches from 2.1 feature branches to main/master #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/generate_dump.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
with:
repository: ror-community/curation_ops
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
ref: schema-v2-1
path: ./curation_ops
- name: Set up Python environment
uses: actions/setup-python@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_dump_zenodo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ jobs:
run: |
cd ./ror-data
python -m pip install --upgrade pip
curl https://raw.githubusercontent.com/ror-community/curation_ops/refs/heads/schema-v2-1/upload_dump_zenodo/requirements.txt -o requirements.txt
curl https://raw.githubusercontent.com/ror-community/curation_ops/refs/heads/main/upload_dump_zenodo/requirements.txt -o requirements.txt
pip install -r requirements.txt
curl https://raw.githubusercontent.com/ror-community/curation_ops/refs/heads/schema-v2-1/upload_dump_zenodo/upload_dump_zenodo.py -o upload_dump_zenodo.py
curl https://raw.githubusercontent.com/ror-community/curation_ops/refs/heads/main/upload_dump_zenodo/upload_dump_zenodo.py -o upload_dump_zenodo.py
python upload_dump_zenodo.py -r ${{github.event.inputs.release}} -p ${{github.event.inputs.record-id}} -e ${{github.event.inputs.zenodo-env}}
- name: Notify Slack
if: always()
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/staging_manual_index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-2-1
path: validation-suite
- name: Validate files
id: validatefiles
Expand All @@ -75,7 +74,7 @@ jobs:
fi
fi
if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/schema-v2-1/ror_schema_v2_1.json -o ror_schema_v2_1.json
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -f ../${{github.event.pull_request.head.ref}}/relationships.csv -p ../files/ --no-geonames
else
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/staging_pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-2-1
path: validation-suite
- name: Validate files
id: validatefiles
Expand All @@ -59,7 +58,7 @@ jobs:
cd validation-suite
python -m pip install --upgrade pip
pip install -r requirements.txt
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/schema-v2-1/ror_schema_v2_1.json -o ror_schema_v2_1.json
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -f ../${{github.event.pull_request.head.ref}}/relationships.csv -p ../files/ --no-geonames
else
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
uses: actions/checkout@v2
with:
repository: ror-community/validation-suite
ref: schema-2-1
path: validation-suite
- name: Get directory name
if: "${{ github.event.inputs.directory-name != '' }}"
Expand All @@ -52,8 +51,8 @@ jobs:
cd validation-suite
python -m pip install --upgrade pip
pip install -r requirements.txt
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/schema-v2-1/ror_schema.json -o ror_schema.json
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/schema-v2-1/ror_schema_v2_1.json -o ror_schema_v2_1.json
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema.json -o ror_schema.json
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
ls ../files/
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
echo "validating v1"
Expand Down