diff --git a/.github/workflows/prod_index_dump.yml b/.github/workflows/prod_index_dump.yml index a80cf3a9666..62e25b0f37a 100644 --- a/.github/workflows/prod_index_dump.yml +++ b/.github/workflows/prod_index_dump.yml @@ -4,14 +4,13 @@ on: inputs: release-dump: type: string - description: Name of existing release dump file to index, without .zip extension (ex v1.41-2024-02-13-ror-data) + description: Name of existing release dump file to index, without .zip extension (ex v2.0-2025-12-16-ror-data) schema-version: required: true description: Schema version to index default: 'test' type: choice options: - - v1 - v2 data-env: required: true @@ -61,11 +60,7 @@ jobs: cd .github/workflows python -m pip install --upgrade pip pip install requests - if [[ ${{ github.event.inputs.schema-version }} == "v1" ]]; then - python index_dump.py -u ${{ secrets.INDEX_DUMP_PROD_API_URL }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_PROD_API_HEADERS }} - else - python index_dump.py -u ${{ secrets.INDEX_DUMP_PROD_API_URL_V2 }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_PROD_API_HEADERS }} - fi + python index_dump.py -u ${{ secrets.INDEX_DUMP_PROD_API_URL_V2 }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_PROD_API_HEADERS }} - name: Notify Slack if: always() uses: edge/simple-slack-notify@master diff --git a/.github/workflows/prod_manual_index.yml b/.github/workflows/prod_manual_index.yml index 363424640b6..ce20a306b38 100644 --- a/.github/workflows/prod_manual_index.yml +++ b/.github/workflows/prod_manual_index.yml @@ -7,7 +7,6 @@ on: description: Schema version type: choice options: - - v1 - v2 release-tag: type: string @@ -73,12 +72,7 @@ jobs: cd .github/workflows python -m pip install --upgrade pip pip install requests - if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then - python index_files.py -u ${{ secrets.INDEX_PROD_API_URL_V1 }} -d ${{ github.event.inputs.directory-name }}-v1 -he ${{ secrets.INDEX_DEV_API_HEADERS }} - fi - if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then - python index_files.py -u ${{ secrets.INDEX_PROD_API_URL_V2 }} -d ${{ github.event.inputs.directory-name }}-v2 -he ${{ secrets.INDEX_DEV_API_HEADERS }} - fi + python index_files.py -u ${{ secrets.INDEX_PROD_API_URL_V2 }} -d ${{ github.event.inputs.release-tag }}-v2 -he ${{ secrets.INDEX_DEV_API_HEADERS }} - name: Notify Slack if: always() uses: edge/simple-slack-notify@master diff --git a/.github/workflows/staging_index_dump.yml b/.github/workflows/staging_index_dump.yml index 3c5ca374281..57adbf3c29f 100644 --- a/.github/workflows/staging_index_dump.yml +++ b/.github/workflows/staging_index_dump.yml @@ -4,14 +4,13 @@ on: inputs: release-dump: type: string - description: Name of existing release dump file to index, without .zip extension (ex v1.41-2024-02-13-ror-data) + description: Name of existing release dump file to index, without .zip extension (ex v2.0-2025-12-16-ror-data) schema-version: required: true description: Schema version to index default: 'test' type: choice options: - - v1 - v2 data-env: required: true @@ -61,11 +60,7 @@ jobs: cd .github/workflows python -m pip install --upgrade pip pip install requests - if [[ ${{ github.event.inputs.schema-version }} == "v1" ]]; then - python index_dump.py -u ${{ secrets.INDEX_DUMP_STAGING_API_URL }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - else - python index_dump.py -u ${{ secrets.INDEX_DUMP_STAGING_API_URL_V2 }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - fi + python index_dump.py -u ${{ secrets.INDEX_DUMP_STAGING_API_URL_V2 }} -f ${{ github.event.inputs.release-dump }} -e ${{ github.event.inputs.data-env }} -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - name: Notify Slack if: always() uses: edge/simple-slack-notify@master diff --git a/.github/workflows/staging_manual_index.yml b/.github/workflows/staging_manual_index.yml index c54e2041287..22c9ebc666e 100644 --- a/.github/workflows/staging_manual_index.yml +++ b/.github/workflows/staging_manual_index.yml @@ -7,7 +7,6 @@ on: description: Schema version type: choice options: - - v1 - v2 directory-name: type: string @@ -66,22 +65,12 @@ jobs: cd validation-suite python -m pip install --upgrade pip pip install -r requirements.txt - if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then - curl https://raw.githubusercontent.com/ror-community/ror-schema/master/ror_schema.json -o ror_schema.json - if [[ -f "../${{github.event.pull_request.head.ref}}/relationships.csv" ]]; then - 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 - else - python run_validations.py -i ../files -v 1 -s ror_schema.json --no-geonames - 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 - 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 - python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json --no-geonames - fi - fi + 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 + 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 + python run_validations.py -i ../files -v 2 -s ror_schema_v2_1.json --no-geonames + fi - name: Notify Slack if: always() uses: edge/simple-slack-notify@master @@ -125,12 +114,7 @@ jobs: cd .github/workflows python -m pip install --upgrade pip pip install requests - if [[ ${{ github.event.inputs.schema-version }} == 'v1' ]]; then - python index_files.py -u ${{ secrets.INDEX_STAGING_API_URLL_V1 }} -d ${{ github.event.inputs.directory-name }}-v1 -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - fi - if [[ ${{ github.event.inputs.schema-version }} == 'v2' ]]; then - python index_files.py -u ${{ secrets.INDEX_STAGING_API_URL_V2 }} -d ${{ github.event.inputs.directory-name }}-v2 -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - fi + python index_files.py -u ${{ secrets.INDEX_STAGING_API_URL_V2 }} -d ${{ github.event.inputs.directory-name }}-v2 -he ${{ secrets.INDEX_STAGING_API_HEADERS }} - name: Notify Slack if: always() uses: edge/simple-slack-notify@master