Skip to content

Commit

Permalink
Merge pull request #144 from ror-community/dev
Browse files Browse the repository at this point in the history
Merge v1.24 to main
  • Loading branch information
lizkrznarich authored Apr 26, 2023
2 parents 4acf15b + 4f26257 commit 7e7bc87
Show file tree
Hide file tree
Showing 440 changed files with 49,544 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev_manual_index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
cd .github/workflows
python -m pip install --upgrade pip
pip install requests==2.23.0
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.directory-name }} -es -d ${{ github.event.inputs.es-version }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.directory-name }} -es ${{ github.event.inputs.es-version }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
- name: Notify Slack
if: always()
uses: edge/simple-slack-notify@master
Expand All @@ -122,5 +122,5 @@ jobs:
with:
channel: '#ror-curation-releases'
color: 'good'
text: 'DEV index status: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.directory-name }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
text: 'DEV index status to ES ${{ github.event.inputs.es-version }}: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.directory-name }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'

2 changes: 1 addition & 1 deletion .github/workflows/dev_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
cd .github/workflows
python -m pip install --upgrade pip
pip install requests==2.23.0
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ env.release_branch }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ env.release_branch }} -es 7 -he ${{ secrets.INDEX_DEV_API_HEADERS }}
- name: Notify Slack
if: always()
uses: edge/simple-slack-notify@master
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/main_manual_index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ on:
type: string
required: true
description: Name of the release tag that you would like to deploy to DEV
es-version:
description: Elastic search version to deploy to
required: true
default: 7
type: choice
options:
- 6
- 7
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -65,7 +73,7 @@ jobs:
cd .github/workflows
python -m pip install --upgrade pip
pip install requests==2.23.0
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.release-tag }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.release-tag }} -es ${{ github.event.inputs.es-version }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
- name: Notify Slack
if: always()
uses: edge/simple-slack-notify@master
Expand All @@ -74,5 +82,5 @@ jobs:
with:
channel: '#ror-curation-releases'
color: 'good'
text: 'DEV index status: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.release-tag }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
text: 'DEV index status to ES ${{ github.event.inputs.es-version }}: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.release-tag }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'

2 changes: 1 addition & 1 deletion .github/workflows/main_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
cd .github/workflows
python -m pip install --upgrade pip
pip install requests==2.23.0
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.release.tag_name }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.release.tag_name }} -es 7 -he ${{ secrets.INDEX_DEV_API_HEADERS }}
- name: Notify Slack
if: always()
uses: edge/simple-slack-notify@master
Expand Down
90 changes: 90 additions & 0 deletions rc-v1.24/000025p04.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"id": "https://ror.org/000025p04",
"name": "Thailand Science Research and Innovation",
"email_address": null,
"ip_addresses": [],
"established": 2019,
"types": [
"Government"
],
"relationships": [
{
"label": "Thailand Research Fund",
"type": "Predecessor",
"id": "https://ror.org/03gd1bh37"
}
],
"addresses": [
{
"lat": 13.75398,
"lng": 100.50144,
"state": null,
"state_code": null,
"city": "Bangkok",
"geonames_city": {
"id": 1609350,
"city": "Bangkok",
"geonames_admin1": {
"name": "Bangkok",
"id": 1609348,
"ascii_name": "Bangkok",
"code": "TH.40"
},
"geonames_admin2": {
"name": null,
"id": null,
"ascii_name": null,
"code": null
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
}
},
"postcode": null,
"primary": false,
"line": null,
"country_geonames_id": 1605651
}
],
"links": [
"https://www.tsri.or.th"
],
"aliases": [],
"acronyms": [
"TSRI"
],
"status": "active",
"wikipedia_url": null,
"labels": [
{
"label": "สำนักงานคณะกรรมการส่งเสริมวิทยาศาสตร์ วิจัยและนวัตกรรม",
"iso639": "th"
}
],
"country": {
"country_name": "Thailand",
"country_code": "TH"
},
"external_ids": {
"FundRef": {
"preferred": "501100017170",
"all": [
"501100017170",
"501100016204"
]
}
}
}
81 changes: 81 additions & 0 deletions rc-v1.24/0006e6p34.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"id": "https://ror.org/0006e6p34",
"name": "ECOLOG-Institut für sozial-ökologische Forschung und Bildung",
"email_address": null,
"ip_addresses": [],
"established": 2003,
"types": [
"Nonprofit"
],
"relationships": [],
"addresses": [
{
"lat": 52.37052,
"lng": 9.73322,
"state": null,
"state_code": null,
"city": "Hanover",
"geonames_city": {
"id": 2910831,
"city": "Hanover",
"geonames_admin1": {
"name": "Lower Saxony",
"id": 2862926,
"ascii_name": "Lower Saxony",
"code": "DE.06"
},
"geonames_admin2": {
"name": null,
"id": null,
"ascii_name": null,
"code": "DE.06.00"
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
}
},
"postcode": null,
"primary": false,
"line": null,
"country_geonames_id": 2921044
}
],
"links": [
"https://www.ecolog-institut.de/"
],
"aliases": [
"ECOLOG"
],
"acronyms": [],
"status": "active",
"wikipedia_url": "",
"labels": [
{
"label": "ECOLOG Institute for Social-Ecological Research and Education",
"iso639": "en"
}
],
"country": {
"country_name": "Germany",
"country_code": "DE"
},
"external_ids": {
"GRID": {
"preferred": "grid.506181.b",
"all": "grid.506181.b"
}
}
}
85 changes: 85 additions & 0 deletions rc-v1.24/000z46s85.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"id": "https://ror.org/000z46s85",
"name": "Lille’s Cardiology Hospital",
"email_address": null,
"ip_addresses": [],
"established": 1978,
"types": [
"Healthcare"
],
"relationships": [
{
"label": "Centre Hospitalier Universitaire de Lille",
"type": "Parent",
"id": "https://ror.org/02ppyfa04"
}
],
"addresses": [
{
"lat": 50.63297,
"lng": 3.05858,
"state": null,
"state_code": null,
"city": "Lille",
"geonames_city": {
"id": 2998324,
"city": "Lille",
"geonames_admin1": {
"name": "Hauts-de-France",
"id": 11071624,
"ascii_name": "Hauts-de-France",
"code": "FR.32"
},
"geonames_admin2": {
"name": "North",
"id": 2990129,
"ascii_name": "North",
"code": "FR.32.59"
},
"license": {
"attribution": "Data from geonames.org under a CC-BY 3.0 license",
"license": "http://creativecommons.org/licenses/by/3.0/"
},
"nuts_level1": {
"name": null,
"code": null
},
"nuts_level2": {
"name": null,
"code": null
},
"nuts_level3": {
"name": null,
"code": null
}
},
"postcode": null,
"primary": false,
"line": null,
"country_geonames_id": 3017382
}
],
"links": [
"http://www.chru-lille.fr/organisation-structure/hopitaux/98604.html"
],
"aliases": [],
"acronyms": [],
"status": "active",
"wikipedia_url": "",
"labels": [
{
"label": "Hôpital Cardiologique",
"iso639": "fr"
}
],
"country": {
"country_name": "France",
"country_code": "FR"
},
"external_ids": {
"GRID": {
"preferred": "grid.414041.4",
"all": "grid.414041.4"
}
}
}
Loading

0 comments on commit 7e7bc87

Please sign in to comment.