Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged Develop to resolved conflicts with OEDv4, and update quoting #231

Merged
merged 14 commits into from
Nov 28, 2024

Conversation

sambles
Copy link
Contributor

@sambles sambles commented Nov 28, 2024

Merged Develop to resolved conflicts with OEDv4, and update quoting

Taken the release/4.0.0 branch and merged in develop, then resolved any conflicts.
All versions of the CSV under OpenExposureData/* were taken 'as is' from the release/4.0.0 branch, and then had the double quoiting added to all CSV files.

JSON Spec output for comparison

The two match except for some list reshuffling (which shouldn't matter)
This-PR__OpenExposureData_Spec.json
Release-OEDv4_OpenExposureData_Spec.json

sambles and others added 12 commits October 28, 2024 16:44
* CI update for v4 OED release (#211)

* test pr list build artifact

* Fix unexpected column name change

* Add build step to post excel on PR's

* Add script to update rel links

* Update release script for test

* check

* Fix

* release test working

* revert extractor changes

* only test pushes on master/dev
Co-authored-by: Sam Gamble <[email protected]>
* use minimal quoting instead of all quoting to save csv file

* update readme to reflect change from xlsx to csv

* fix for OpenExposureData/AreaCodeValues.csv AreaCode leading 0
Merge branch 'release/3.4.1' of https://github.com/OasisLMF/ODS_OpenExposureData into release/3.4.1
Copy link

Build Preview

You can find files attached to the below linked Workflow Run URL (Logs).
Please note that files only stay for around 14 days!

Name Link
Commit 81d90a8
Build https://github.com/OasisLMF/ODS_OpenExposureData/actions/runs/12068667423
Excel File excel_spec.zip
JSON File extracted_spec.zip

Copy link

Build Preview

You can find files attached to the below linked Workflow Run URL (Logs).
Please note that files only stay for around 14 days!

Name Link
Commit ff87197
Build https://github.com/OasisLMF/ODS_OpenExposureData/actions/runs/12068809434
Excel File excel_spec.zip
JSON File extracted_spec.zip

Copy link

Build Preview

You can find files attached to the below linked Workflow Run URL (Logs).
Please note that files only stay for around 14 days!

Name Link
Commit 462d148
Build https://github.com/OasisLMF/ODS_OpenExposureData/actions/runs/12068829709
Excel File excel_spec.zip
JSON File extracted_spec.zip

@sambles sambles requested review from johcarter and MattDonovan82 and removed request for MattDonovan82 November 28, 2024 12:29
Copy link

Build Preview

You can find files attached to the below linked Workflow Run URL (Logs).
Please note that files only stay for around 14 days!

Name Link
Commit cf745e2
Build https://github.com/OasisLMF/ODS_OpenExposureData/actions/runs/12068912814
Excel File excel_spec.zip
JSON File extracted_spec.zip

@sambles sambles changed the title Fix merge conf oedv4 Fix merge conf oedv4, and update quoting Nov 28, 2024
@sambles sambles changed the title Fix merge conf oedv4, and update quoting Merged Develop to resolved conflicts with OEDv4, and update quoting Nov 28, 2024
@sambles sambles force-pushed the fix-merge-conf_OEDv4 branch from 30748a3 to c7030a8 Compare November 28, 2024 13:14
Copy link

Build Preview

You can find files attached to the below linked Workflow Run URL (Logs).
Please note that files only stay for around 14 days!

Name Link
Commit de17864
Build https://github.com/OasisLMF/ODS_OpenExposureData/actions/runs/12069615953
Excel File excel_spec.zip
JSON File extracted_spec.zip

@sambles sambles merged commit 25e99f4 into release/4.0.0 Nov 28, 2024
8 checks passed
@sambles sambles deleted the fix-merge-conf_OEDv4 branch November 28, 2024 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants