From 3e1774da7a2aab205a127e9438d2c5bc05b40d08 Mon Sep 17 00:00:00 2001 From: lizkrznarich Date: Fri, 4 Apr 2025 15:22:55 -0500 Subject: [PATCH] switch workflow branchs from 2.1 feature branches to main/master --- .github/workflows/generate_dump.yml | 1 - .github/workflows/publish_dump_zenodo.yml | 4 ++-- .github/workflows/staging_manual_index.yml | 3 +-- .github/workflows/staging_pull_request.yml | 3 +-- .github/workflows/validate.yml | 5 ++--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generate_dump.yml b/.github/workflows/generate_dump.yml index 34d3c8d16d..ac8274c515 100644 --- a/.github/workflows/generate_dump.yml +++ b/.github/workflows/generate_dump.yml @@ -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 diff --git a/.github/workflows/publish_dump_zenodo.yml b/.github/workflows/publish_dump_zenodo.yml index 6a0bad0f45..60cbf14cb0 100644 --- a/.github/workflows/publish_dump_zenodo.yml +++ b/.github/workflows/publish_dump_zenodo.yml @@ -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() diff --git a/.github/workflows/staging_manual_index.yml b/.github/workflows/staging_manual_index.yml index dd68001bbe..bae28aa76a 100644 --- a/.github/workflows/staging_manual_index.yml +++ b/.github/workflows/staging_manual_index.yml @@ -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 @@ -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 diff --git a/.github/workflows/staging_pull_request.yml b/.github/workflows/staging_pull_request.yml index 5b0ba10faa..f3c2813ba6 100644 --- a/.github/workflows/staging_pull_request.yml +++ b/.github/workflows/staging_pull_request.yml @@ -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 @@ -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 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2b56c6ed77..ec1ddceae3 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -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 != '' }}" @@ -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"