From 2fb87e0ac05dd044920efa87fb15e37f818cc0a9 Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Thu, 20 Nov 2025 16:34:57 +1300 Subject: [PATCH 1/5] updated CI action --- .github/workflows/generate-schema.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml index 48c3f4de..32e5026b 100644 --- a/.github/workflows/generate-schema.yml +++ b/.github/workflows/generate-schema.yml @@ -22,6 +22,14 @@ jobs: run: | echo "Automated commit detected - skipping job" echo "skip_job=true" >> "$GITHUB_OUTPUT" + - name: Check Branch with Regex + id: check-tag + run: | + if [[ "${{ github.ref }}" =~ ^refs/heads/brapi-V[0-9]+\.[0-9]+$ ]]; then + echo "commit=true" >> $GITHUB_ENV + else + echo "commit=false" >> $GITHUB_ENV + fi generate: runs-on: ubuntu-latest @@ -63,4 +71,5 @@ jobs: - name: Compare OpenAPI working-directory: ./generator run: ./gradlew compareAll - - uses: stefanzweifel/git-auto-commit-action@v5 + - if: env.commit == 'true' + uses: stefanzweifel/git-auto-commit-action@v5 From 1e5f06793f922b8435ca4d9bae29549ae80f7feb Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Thu, 20 Nov 2025 16:41:12 +1300 Subject: [PATCH 2/5] corrected EnvironmentParameters to EnvironmentParameter --- .github/workflows/generate-schema.yml | 6 +++++- Specification/BrAPI-Schema/BrAPI-Core/Study.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml index 32e5026b..53110ee9 100644 --- a/.github/workflows/generate-schema.yml +++ b/.github/workflows/generate-schema.yml @@ -30,7 +30,11 @@ jobs: else echo "commit=false" >> $GITHUB_ENV fi - + if: env.commit == 'true' + echo "Release branch - will commit generated files" + else + echo "Feature branch - will NOT commit generated files" + fi generate: runs-on: ubuntu-latest needs: check diff --git a/Specification/BrAPI-Schema/BrAPI-Core/Study.json b/Specification/BrAPI-Schema/BrAPI-Core/Study.json index 044360c9..e366bebf 100644 --- a/Specification/BrAPI-Schema/BrAPI-Core/Study.json +++ b/Specification/BrAPI-Schema/BrAPI-Core/Study.json @@ -382,7 +382,7 @@ "parameterName", "description" ], - "title": "EnvironmentParameters", + "title": "EnvironmentParameter", "description": "Environmental parameters that were kept constant throughout the study and did not change between observation units. \n\nMIAPPE V1.1 (DM-57) Environment - Environmental parameters that were kept constant throughout the study and did not change between observation units or assays. Environment characteristics that vary over time, i.e. environmental variables, should be recorded as Observed Variables (see below).", "type": "object", "brapi-metadata": { From 0b6db8ffccdd34edb250a5173805a6cb4baee29f Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Thu, 20 Nov 2025 16:42:54 +1300 Subject: [PATCH 3/5] corrected if statement --- .github/workflows/generate-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml index 53110ee9..1fc119cb 100644 --- a/.github/workflows/generate-schema.yml +++ b/.github/workflows/generate-schema.yml @@ -30,7 +30,7 @@ jobs: else echo "commit=false" >> $GITHUB_ENV fi - if: env.commit == 'true' + if env.commit == 'true' echo "Release branch - will commit generated files" else echo "Feature branch - will NOT commit generated files" From 40a02379e8497860943bf975650e83f5bd0499d1 Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Thu, 20 Nov 2025 16:47:05 +1300 Subject: [PATCH 4/5] corrected if statement --- .github/workflows/generate-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml index 1fc119cb..d74d0226 100644 --- a/.github/workflows/generate-schema.yml +++ b/.github/workflows/generate-schema.yml @@ -30,7 +30,7 @@ jobs: else echo "commit=false" >> $GITHUB_ENV fi - if env.commit == 'true' + if [[env.commit == 'true']]; then echo "Release branch - will commit generated files" else echo "Feature branch - will NOT commit generated files" From 1acc859345324f6caef0e0e27b622b2683deed79 Mon Sep 17 00:00:00 2001 From: Guy Davenport Date: Thu, 20 Nov 2025 16:50:55 +1300 Subject: [PATCH 5/5] corrected if statement --- .github/workflows/generate-schema.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-schema.yml b/.github/workflows/generate-schema.yml index d74d0226..7d096dcb 100644 --- a/.github/workflows/generate-schema.yml +++ b/.github/workflows/generate-schema.yml @@ -25,7 +25,7 @@ jobs: - name: Check Branch with Regex id: check-tag run: | - if [[ "${{ github.ref }}" =~ ^refs/heads/brapi-V[0-9]+\.[0-9]+$ ]]; then + if [ "${{ github.ref }}" =~ ^refs/heads/brapi-V[0-9]+\.[0-9]+$ ]; then echo "commit=true" >> $GITHUB_ENV else echo "commit=false" >> $GITHUB_ENV