Skip to content

Commit b5623f0

Browse files
lizkrznarichlizkrznarich
authored
Merge pull request #220 from ror-community/dev
Merge dev to main: Update to latest workflow files
2 parents 4c9c0bd + a173f93 commit b5623f0

12 files changed

Lines changed: 31 additions & 28 deletions

‎.github/workflows/dev_manual_index.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
uses: actions/checkout@v2
5757
with:
5858
repository: ror-community/validation-suite
59-
ref: schema-v2
6059
path: validation-suite
6160
- name: Validate files
6261
id: validatefiles
@@ -67,19 +66,19 @@ jobs:
6766
python -m pip install --upgrade pip
6867
pip install -r requirements.txt
6968
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
70-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema.json -o ror_schema.json
69+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema.json -o ror_schema.json
7170
if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then
7271
python run_validations.py -i ../files -v 1 -s ror_schema.json -f ../${{github.event.pull_request.head.ref}}/relationships.csv -p ../files/ --no-geonames
7372
else
7473
python run_validations.py -i ../files -v 1 -s ror_schema.json --no-geonames
7574
fi
7675
fi
7776
if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
78-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema_v2_0.json -o ror_schema_v2_0.json
77+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
7978
if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then
80-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{github.event.pull_request.head.ref}}/relationships.csv -p ../files/ --no-geonames
79+
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
8180
else
82-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json --no-geonames
81+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json --no-geonames
8382
fi
8483
fi
8584
- name: Notify Slack

‎.github/workflows/dev_pull_request.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
uses: actions/checkout@v2
5050
with:
5151
repository: ror-community/validation-suite
52-
ref: schema-v2
5352
path: validation-suite
5453
- name: Validate files
5554
id: validatefiles
@@ -59,11 +58,11 @@ jobs:
5958
cd validation-suite
6059
python -m pip install --upgrade pip
6160
pip install -r requirements.txt
62-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema_v2_0.json -o ror_schema_v2_0.json
61+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/main/ror_schema_v2_1.json -o ror_schema_v2_1.json
6362
if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then
64-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{github.event.pull_request.head.ref}}/relationships.csv -p ../files/ --no-geonames
63+
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
6564
else
66-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json --no-geonames
65+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json --no-geonames
6766
fi
6867
- name: Notify Slack
6968
if: always()

‎.github/workflows/generate_dump.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
with:
4444
repository: ror-community/curation_ops
4545
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
46-
ref: v2-crosswalk
4746
path: ./curation_ops
4847
- name: Set up Python environment
4948
uses: actions/setup-python@v2

‎.github/workflows/generate_dump_v2_initial_release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
with:
5050
repository: ror-community/curation_ops
5151
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
52-
ref: v2-crosswalk
5352
path: ./curation_ops
5453
- name: Set up Python environment
5554
uses: actions/setup-python@v2

‎.github/workflows/generate_relationships.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
python -m pip install --upgrade pip
3939
pip install requests==2.23.0
40-
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/generate_relationships/generate_relationships.py -o generate_relationships.py
40+
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/generate_relationships/generate_relationships.py -o generate_relationships.py
4141
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4242
python generate_relationships.py relationships.csv -v 1
4343
fi

‎.github/workflows/remove_relationships.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ jobs:
3737
run: |
3838
python -m pip install --upgrade pip
3939
pip install requests==2.23.0
40+
<<<<<<< HEAD
41+
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/remove_relationships/remove_relationships.py -o remove_relationships.py
42+
=======
4043
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/remove_relationships/remove_relationships.py -o remove_relationships.py
44+
>>>>>>> main
4145
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4246
python remove_relationships.py -v 1
4347
fi

‎.github/workflows/update_addresses.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
run: |
3838
python -m pip install --upgrade pip
3939
pip install requests==2.23.0
40-
pip install git+https://github.com/ror-community/update_address.git@v2-locations
41-
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/update_address_only/update_addresses.py -o update_addresses.py
40+
pip install git+https://github.com/ror-community/update_address.git
41+
curl https://raw.githubusercontent.com/ror-community/curation_ops/refs/heads/main/update_address_only/update_addresses.py -o update_addresses.py
4242
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4343
python update_addresses.py -v 1
4444
fi

‎.github/workflows/update_labels.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ jobs:
3636
working-directory: ${{ env.WORKING_DIR }}
3737
run: |
3838
python -m pip install --upgrade pip
39+
<<<<<<< HEAD
40+
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/requirements.txt -o requirements.txt
41+
pip install -r requirements.txt
42+
curl https://raw.githubusercontent.com/ror-community/curation_ops/main/update_related_records/update_related.py -o update_related.py
43+
=======
3944
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/update_related_records/requirements.txt -o requirements.txt
4045
pip install -r requirements.txt
4146
curl https://raw.githubusercontent.com/ror-community/curation_ops/update-last-mod-all-update-actions/update_related_records/update_related.py -o update_related.py
47+
>>>>>>> main
4248
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
4349
python update_related.py -v 1
4450
fi

‎.github/workflows/validate-dump.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
uses: actions/checkout@v2
3535
with:
3636
repository: ror-community/validation-suite
37-
ref: schema-v2
3837
path: validation-suite
3938
- name: Get directory name
4039
if: "${{ github.event.inputs.directory-name != '' }}"
@@ -49,17 +48,16 @@ jobs:
4948
cd validation-suite
5049
python -m pip install --upgrade pip
5150
pip install -r requirements.txt
52-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema.json -o ror_schema.json
53-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema_v2_0.json -o ror_schema_v2_0.json
54-
ls ../files/
51+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema.json -o ror_schema.json
52+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
5553
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
5654
echo "validating v1"
5755
python run_validations.py -i ../${{ env.WORKING_DIR }}/${{ github.event.inputs.file-name}} -v 1 -s ror_schema.json
5856
5957
fi
6058
if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then
6159
echo "validating v2"
62-
python run_validations.py -i ../${{ env.WORKING_DIR }}/${{ github.event.inputs.file-name}} -v 2 -s ror_schema_v2_0.json
60+
python run_validations.py -i ../${{ env.WORKING_DIR }}/${{ github.event.inputs.file-name}} -v 2 -s ror_schema_v2_1.json
6361
fi
6462
- name: Notify Slack
6563
if: always()

‎.github/workflows/validate.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
uses: actions/checkout@v2
3737
with:
3838
repository: ror-community/validation-suite
39-
ref: schema-v2
4039
path: validation-suite
4140
- name: Get directory name
4241
if: "${{ github.event.inputs.directory-name != '' }}"
@@ -53,8 +52,8 @@ jobs:
5352
cd validation-suite
5453
python -m pip install --upgrade pip
5554
pip install -r requirements.txt
56-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema.json -o ror_schema.json
57-
curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema_v2_0.json -o ror_schema_v2_0.json
55+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema.json -o ror_schema.json
56+
curl https://raw.githubusercontent.com/ror-community/ror-schema/refs/heads/master/ror_schema_v2_1.json -o ror_schema_v2_1.json
5857
ls ../files/
5958
if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then
6059
echo "validating v1"
@@ -85,22 +84,22 @@ jobs:
8584
if [[ ${{ github.event.inputs.skip-geonames }} == true ]]; then
8685
if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
8786
if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
88-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/ --no-geonames
87+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/ --no-geonames
8988
else
90-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -p ../files/ --no-geonames
89+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -p ../files/ --no-geonames
9190
fi
9291
elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
93-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json --no-geonames
92+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json --no-geonames
9493
fi
9594
else
9695
if [[ ${{ github.event.inputs.with-relationship }} == true ]]; then
9796
if [[ -f "../${{ env.WORKING_DIR }}/relationships.csv" ]]; then
98-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/
97+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -f ../${{ env.WORKING_DIR }}/relationships.csv -p ../files/
9998
else
100-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json -p ../files/
99+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json -p ../files/
101100
fi
102101
elif [[ ${{ github.event.inputs.with-relationship }} == false ]]; then
103-
python run_validations.py -i ../files -v 2 -s ror_schema_v2_0.json
102+
python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json
104103
fi
105104
fi
106105
fi

0 commit comments

Comments
 (0)