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

KF 1.7 Central Dashboard merge into stc-master #143

Closed
mathis-marcotte opened this issue Jun 28, 2023 · 2 comments
Closed

KF 1.7 Central Dashboard merge into stc-master #143

mathis-marcotte opened this issue Jun 28, 2023 · 2 comments
Assignees

Comments

@mathis-marcotte
Copy link

mathis-marcotte commented Jun 28, 2023

Let's merge our 1.7 upgrade branch into our master branch.

Looking at the tentative PR for this, there seems to be a lot of merge conflicts, so we just need to fix those to then merge.

@mathis-marcotte mathis-marcotte transferred this issue from StatCan/aaw Jun 28, 2023
@mathis-marcotte mathis-marcotte self-assigned this Jun 28, 2023
@mathis-marcotte mathis-marcotte changed the title KF 1.7 Merge into stc-master KF 1.7 Central Dashboard merge into stc-master Jun 28, 2023
@mathis-marcotte
Copy link
Author

Resolved the merge conflicts, it was just a matter of accepting the changes that were done for 1.7.

The issues now are that some of the workflows are not passing, will have to look at those

@mathis-marcotte
Copy link
Author

Issues with the workflows are resolved. The main things were that crud-web-apps had some problems that were probably introduced during the rebase. Fixed those by just directly taking the 1.7 code for crud-web-apps.

There was also an issue with the centraldashboard dockerfile, just needed to use the correct version of the node 16 image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant