Skip to content

Swerc suggestions #32

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
merged 7 commits into from
Mar 22, 2022
Merged

Swerc suggestions #32

merged 7 commits into from
Mar 22, 2022

Conversation

vmcj
Copy link
Member

@vmcj vmcj commented Mar 9, 2022

Lets first agree on which ones we want to keep and afterwards I can make the message useful.

vmcj added 5 commits March 9, 2022 18:49
We typicly later branch from main to a dedicated branch but this should
work most of the time.
There is a correlation between the restricted network and dedicated git
repo this makes this very explicit.
Copy link
Member

@nickygerritsen nickygerritsen left a comment

Choose a reason for hiding this comment

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

Changes look good. I wonder if we should but the EFI_ORDER as (commented out) thing in the group variables?

@@ -38,6 +38,7 @@ PHP_MAX_FILE_UPLOADS: 101
# Git repo URL
DJ_GIT_HOST: "{{MAIN_ADMIN_IP}}"
DJ_GIT_REPO: "domjudge@{{DJ_GIT_HOST}}:domjudge"
DJ_GIT_REPO_UPSTREAM: "https://github.com/domjudge/domjudge.git"
DJ_GIT_REPO_SCRIPTS: "domjudge@{{DJ_GIT_HOST}}:domjudge-scripts-bare"
Copy link
Member

Choose a reason for hiding this comment

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

Do we need a similar thing for this repo?

Copy link
Member

Choose a reason for hiding this comment

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

I think it makes more sense to set the DJ_GIT_REPO variable correctly depending on context, instead of duplicating the create working copy of the domjudge repo task below.

Copy link
Member Author

Choose a reason for hiding this comment

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

For the SCRIPTS? That probably relevant if we would have admin machines.,

I think we'll never use it but yes, I'll add it.

Copy link
Member Author

Choose a reason for hiding this comment

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

And I agree with Jaap, just for fixing the script this was the quickest fix.

@@ -38,6 +38,7 @@ PHP_MAX_FILE_UPLOADS: 101
# Git repo URL
DJ_GIT_HOST: "{{MAIN_ADMIN_IP}}"
DJ_GIT_REPO: "domjudge@{{DJ_GIT_HOST}}:domjudge"
DJ_GIT_REPO_UPSTREAM: "https://github.com/domjudge/domjudge.git"
DJ_GIT_REPO_SCRIPTS: "domjudge@{{DJ_GIT_HOST}}:domjudge-scripts-bare"
Copy link
Member

Choose a reason for hiding this comment

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

I think it makes more sense to set the DJ_GIT_REPO variable correctly depending on context, instead of duplicating the create working copy of the domjudge repo task below.

@@ -93,6 +93,17 @@
- tig
Copy link
Member Author

Choose a reason for hiding this comment

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

Also need to fix the composer as we need the "hip" one which I now locally installed.

@vmcj vmcj requested a review from eldering March 9, 2022 21:45
Copy link
Member

@nickygerritsen nickygerritsen left a comment

Choose a reason for hiding this comment

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

I will merge this since I am setting up the SWERC server. I think it looks good but any more changes we can do later.

@nickygerritsen nickygerritsen merged commit 3543032 into DOMjudge:main Mar 22, 2022
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