Skip to content

Conversation

@Phu2
Copy link
Contributor

@Phu2 Phu2 commented Feb 17, 2025

Might help with #194

@Phu2 Phu2 requested a review from dr0i February 17, 2025 16:11
@dr0i
Copy link
Member

dr0i commented Feb 21, 2025

Copy link
Member

@dr0i dr0i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dou you merge and deploy it on stage on prod @Phu2 ?

@Phu2
Copy link
Contributor Author

Phu2 commented Feb 24, 2025

Merged into main and deployed on stage/test, see https://test.metafacture.org/playground/
Versions of metafix and metafacture-framework differ from prod: https://metafacture.org/playground/
Should i proceed with deployment on prod, @dr0i ?

@dr0i
Copy link
Member

dr0i commented Feb 24, 2025

@Phu2 it doesn't seemed to be merged into main. Can you have a look?

@Phu2
Copy link
Contributor Author

Phu2 commented Feb 24, 2025

I did only merge on the test server. If the deployment on test is approved i will do the same on prod and push main to remote.
However, i am not entirely sure if this is our preferred workflow.

@dr0i
Copy link
Member

dr0i commented Feb 24, 2025

Hm. My preferred workflow is to push to main and then deploy this on server.

I have already pushed into main the use of metafacture-master-SNAPHSOT as dependency (as we agreed in today's meeting (and as we actually agreed on long before:"We use the simple GitHub workflow: the main branch is always the version that is actually deployed to production" (which I totally forgot about)).
However, the build of main fails because of some repairings that are part of raise-cpu-limit, like e.g. a0f0e22(which I better had pushed to main in the first place as these commits don't originate from this branch raise-cpu-limit (while this was the branch where I've experienced the failing for the first time, though, as seen in GitHub actions).
So, tl;dr:
a) you could merge raise-cpu-limit into main
b) you could merge main into raise-cpu-limit and deploy this

Probably, as the question between the differences has arosen in this PR I should have pushed the use of master-SNAPSHOT into this branch here, not to main.

@Phu2 Phu2 merged commit 855effd into main Feb 24, 2025
1 check passed
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

Successfully merging this pull request may close these issues.

3 participants