Skip to content

Commit 62b4443

Browse files
authored
Merge pull request #5 from OpenCatalogi/fix/file-name-variations
Enable file name variations
2 parents 360ef2e + c51fe56 commit 62b4443

1 file changed

Lines changed: 42 additions & 6 deletions

File tree

action.yaml

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,22 @@ runs:
9999
d[key] = default_value
100100
101101
# Read existing publiccode.yaml
102+
filename = "publiccode.yaml"
103+
102104
try:
103-
with open("publiccode.yaml", "r") as f:
105+
with open(filename, "r") as f:
104106
data = yaml.safe_load(f)
105107
except FileNotFoundError:
106108
data = {}
107109
110+
if (data == {}):
111+
try:
112+
with open("publiccode.yml", "r" as f:
113+
data = yaml.safe_load(f)
114+
filename = "publiccode.yml"
115+
except FileNotFoundError:
116+
data = data
117+
108118
# Convert created_at to date format
109119
created_at_date = datetime.now().strftime('%Y-%m-%d')
110120
@@ -170,7 +180,7 @@ runs:
170180
data['organisation']['description'] = os.environ['ORGANISATION_DESCRIPTION']
171181
172182
# Write updated publiccode.yaml
173-
with open("publiccode.yaml", "w") as f:
183+
with open(filename, "w") as f:
174184
yaml.safe_dump(data, f)
175185
END
176186
# Create changes if it is an organisation repository
@@ -200,11 +210,37 @@ runs:
200210
support.append({"software": repository, "type": "community"})
201211
202212
# Read existing opencatalogi.yaml
213+
filename = "opencatalogi.yaml"
214+
203215
try:
204-
with open("opencatalogi.yaml", "r") as f:
216+
with open(filename, "r") as f:
205217
data = yaml.safe_load(f)
206218
except FileNotFoundError:
207219
data = {}
220+
221+
if (data == {}):
222+
try:
223+
with open("openCatalogi.yaml", "r") as f:
224+
data = yaml.safe_load(f)
225+
filename = "openCatalogi.yaml"
226+
except FileNotFoundError:
227+
data = data
228+
229+
if (data == {}):
230+
try:
231+
with open("opencatalogi.yml", "r") as f:
232+
data = yaml.safe_load(f)
233+
filename = "opencatalogi.yml"
234+
except FileNotFoundError:
235+
data = data
236+
237+
if (data == {}):
238+
try:
239+
with open("openCatalogi.yml", "r") as f:
240+
data = yaml.safe_load(f)
241+
filename = "openCatalogi.yml"
242+
except FileNotFoundError:
243+
data = data
208244
209245
# Convert created_at to date format
210246
created_at_date = datetime.now().strftime('%Y-%m-%d')
@@ -221,7 +257,7 @@ runs:
221257
set_default(data, 'softwareSupported', support)
222258
223259
# Write updated opencatalogi.yaml
224-
with open("opencatalogi.yaml", "w") as f:
260+
with open(filename, "w") as f:
225261
yaml.safe_dump(data, f)
226262
END
227263
@@ -233,7 +269,7 @@ runs:
233269
git config --local user.email "${{ inputs.git-mail }}"
234270
git config --local user.name "${{ inputs.git-name }}"
235271
git pull
236-
git add publiccode.yaml
272+
git add publiccode.y*ml
237273
git commit -m "${{ inputs.git-commit-message }}" || echo "No changes to commit"
238274
git push
239275
# Commit changes if it is an organisation repository
@@ -244,7 +280,7 @@ runs:
244280
git config --local user.email "${{ inputs.git-mail }}"
245281
git config --local user.name "${{ inputs.git-name }}"
246282
git pull
247-
git add opencatalogi.yaml
283+
git add open*atalogi.y*ml
248284
git commit -m "${{ inputs.git-commit-message }}" || echo "No changes to commit"
249285
git push
250286
# Post Repository URL to OpenCatalogi API

0 commit comments

Comments
 (0)