Skip to content

Commit 6c52400

Browse files
puja-trivedipuja-trivedi
committed
Merge branch 'issue191' of https://github.com/puja-trivedi/models into issue191
2 parents ce84ddf + 86f9756 commit 6c52400

18 files changed

+301
-1802
lines changed

‎.github/workflows/manual-generate_yaml_model.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: manual-generate-yaml-model
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
model:
7+
description: 'model name'
8+
required: true
9+
type: string
10+
11+
jobs:
12+
call-reusable:
13+
uses: brain-bican/models/.github/workflows/reusable-generate_yaml_model.yaml@main
14+
with:
15+
model: ${{ github.event.inputs.model }}

‎.github/workflows/reusable-generate_other_formats.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,21 @@ jobs:
102102
git status
103103
done
104104
if ! git diff --cached --quiet; then
105-
git commit -m "generate another formats for ${models_list} model(s)"
106105
git status
107106
# Stash any remaining local changes (including untracked files) before pulling
108107
git stash --include-untracked
109108
if git pull --rebase; then
109+
git stash pop || echo "No stashed changes to apply"
110+
git add .
111+
git commit -m "generate another formats for ${models_list} model(s)"
110112
git push
111113
else
112114
echo "Failed to pull --rebase, setting upstream"
115+
git stash pop || echo "No stashed changes to apply"
116+
git add .
117+
git commit -m "generate another formats for ${models_list} model(s)"
113118
git push --set-upstream origin $BRANCH_NAME
114119
fi
115-
# Unstash the changes so they're available for the next workflow step
116-
git stash pop || echo "No stashed changes to apply"
117120
else
118121
echo "No changes to commit"
119122
fi

‎.github/workflows/generate_yaml_model.yaml‎ renamed to ‎.github/workflows/reusable-generate_yaml_model.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# Generates linkml yaml schema from metadata in googlesheets using schemasheets
2-
name: generating yaml file
1+
name: reusable-generate-yaml
32

43
on:
5-
workflow_dispatch:
4+
workflow_call:
65
inputs:
76
model:
87
description: 'model name'
@@ -67,9 +66,9 @@ jobs:
6766
- name: Create a Pull Request
6867
uses: peter-evans/create-pull-request@v4
6968
with:
70-
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
69+
token: ${{ secrets.GITHUB_TOKEN }}
7170
commit-message: "Generate new version of the linkml model for ${{ inputs.model }}"
7271
branch: ${{ env.BRANCH_NAME }}
7372
title: "Auto PR: ${{ inputs.model }}.yaml generated from google spreadsheets using schemasheets"
74-
body: "This PR adds a autogenerated ${{ inputs.model }}.yaml file."
73+
body: "This PR adds an autogenerated ${{ inputs.model }}.yaml file."
7574
base: main

‎erdiagram-autogen/anatomical_structure.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ParcellationAtlas {
88
string version
99
string id
1010
iri_type iri
11-
curieList category
11+
uriorcurieList category
1212
stringList type
1313
label_type name
1414
narrative_text description
@@ -32,7 +32,7 @@ AnatomicalAnnotationSet {
3232
string version
3333
string id
3434
iri_type iri
35-
curieList category
35+
uriorcurieList category
3636
stringList type
3737
label_type name
3838
narrative_text description
@@ -52,7 +52,7 @@ ParcellationColorScheme {
5252
string version
5353
string id
5454
iri_type iri
55-
curieList category
55+
uriorcurieList category
5656
stringList type
5757
label_type name
5858
narrative_text description
@@ -70,7 +70,7 @@ ParcellationTerm {
7070
string version
7171
string id
7272
iri_type iri
73-
curieList category
73+
uriorcurieList category
7474
stringList type
7575
label_type name
7676
narrative_text description
@@ -87,7 +87,7 @@ ParcellationTermSet {
8787
string version
8888
string id
8989
iri_type iri
90-
curieList category
90+
uriorcurieList category
9191
stringList type
9292
label_type name
9393
narrative_text description
@@ -101,7 +101,7 @@ ParcellationTerminology {
101101
string version
102102
string id
103103
iri_type iri
104-
curieList category
104+
uriorcurieList category
105105
stringList type
106106
label_type name
107107
narrative_text description
@@ -116,7 +116,7 @@ AnatomicalSpace {
116116
string version
117117
string id
118118
iri_type iri
119-
curieList category
119+
uriorcurieList category
120120
stringList type
121121
label_type name
122122
narrative_text description
@@ -140,7 +140,7 @@ ImageDataset {
140140
string version
141141
string id
142142
iri_type iri
143-
curieList category
143+
uriorcurieList category
144144
stringList type
145145
label_type name
146146
narrative_text description

‎erdiagram-autogen/bke_taxonomy.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DisplayColor {
55
string color_hex_triplet
66
uriorcurieList xref
77
iri_type iri
8-
curieList category
8+
uriorcurieList category
99
stringList type
1010
label_type name
1111
narrative_text description
@@ -26,7 +26,7 @@ ColorPalette {
2626
string description
2727
uriorcurieList xref
2828
iri_type iri
29-
curieList category
29+
uriorcurieList category
3030
stringList type
3131
boolean deprecated
3232
stringList provided_by
@@ -38,7 +38,7 @@ MatrixFile {
3838
uriorcurieList xref
3939
string id
4040
iri_type iri
41-
curieList category
41+
uriorcurieList category
4242
stringList type
4343
label_type name
4444
narrative_text description
@@ -54,7 +54,7 @@ Abbreviation {
5454
string entity_type
5555
uriorcurieList xref
5656
iri_type iri
57-
curieList category
57+
uriorcurieList category
5858
stringList type
5959
label_type name
6060
narrative_text description
@@ -66,7 +66,7 @@ Abbreviation {
6666
CellSpecimen {
6767
string id
6868
iri_type iri
69-
curieList category
69+
uriorcurieList category
7070
stringList type
7171
label_type name
7272
narrative_text description
@@ -81,7 +81,7 @@ ObservationRow {
8181
uriorcurieList xref
8282
string id
8383
iri_type iri
84-
curieList category
84+
uriorcurieList category
8585
stringList type
8686
label_type name
8787
narrative_text description
@@ -95,7 +95,7 @@ ObservationMatrix {
9595
uriorcurieList xref
9696
string id
9797
iri_type iri
98-
curieList category
98+
uriorcurieList category
9999
stringList type
100100
label_type name
101101
narrative_text description
@@ -107,7 +107,7 @@ ObservationMatrix {
107107
ObservationMatrixCreationProcess {
108108
string id
109109
iri_type iri
110-
curieList category
110+
uriorcurieList category
111111
stringList type
112112
label_type name
113113
narrative_text description
@@ -124,7 +124,7 @@ Cluster {
124124
integer number_of_observations
125125
uriorcurieList xref
126126
iri_type iri
127-
curieList category
127+
uriorcurieList category
128128
stringList type
129129
narrative_text description
130130
boolean deprecated
@@ -140,7 +140,7 @@ ClusterSet {
140140
string description
141141
uriorcurieList xref
142142
iri_type iri
143-
curieList category
143+
uriorcurieList category
144144
stringList type
145145
boolean deprecated
146146
stringList provided_by
@@ -150,7 +150,7 @@ ClusterSet {
150150
ClusteringProcess {
151151
string id
152152
iri_type iri
153-
curieList category
153+
uriorcurieList category
154154
stringList type
155155
label_type name
156156
narrative_text description
@@ -169,7 +169,7 @@ CellTypeTaxon {
169169
integer number_of_cells
170170
uriorcurieList xref
171171
iri_type iri
172-
curieList category
172+
uriorcurieList category
173173
stringList type
174174
boolean deprecated
175175
stringList provided_by
@@ -185,7 +185,7 @@ CellTypeSet {
185185
integer order
186186
uriorcurieList xref
187187
iri_type iri
188-
curieList category
188+
uriorcurieList category
189189
stringList type
190190
boolean deprecated
191191
stringList provided_by
@@ -200,7 +200,7 @@ CellTypeTaxonomy {
200200
string description
201201
uriorcurieList xref
202202
iri_type iri
203-
curieList category
203+
uriorcurieList category
204204
stringList type
205205
boolean deprecated
206206
stringList provided_by
@@ -210,7 +210,7 @@ CellTypeTaxonomy {
210210
CellTypeTaxonomyCreationProcess {
211211
string id
212212
iri_type iri
213-
curieList category
213+
uriorcurieList category
214214
stringList type
215215
label_type name
216216
narrative_text description

‎erdiagram-autogen/genome_annotation.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GenomeAssembly {
99
label_type in_taxon_label
1010
string id
1111
iri_type iri
12-
curieList category
12+
uriorcurieList category
1313
stringList type
1414
label_type name
1515
narrative_text description
@@ -27,7 +27,7 @@ GenomeAnnotation {
2727
string reference_assembly
2828
string id
2929
iri_type iri
30-
curieList category
30+
uriorcurieList category
3131
stringList type
3232
label_type name
3333
narrative_text description
@@ -45,7 +45,7 @@ GeneAnnotation {
4545
string referenced_in
4646
string id
4747
iri_type iri
48-
curieList category
48+
uriorcurieList category
4949
stringList type
5050
label_type name
5151
narrative_text description

0 commit comments

Comments
 (0)