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

terms: tos-update #54

Merged
merged 1 commit into from
Jun 4, 2024
Merged

terms: tos-update #54

merged 1 commit into from
Jun 4, 2024

Conversation

Stanislaw-bnk
Copy link
Contributor

No description provided.

@Stanislaw-bnk Stanislaw-bnk self-assigned this Jan 29, 2024
@Stanislaw-bnk Stanislaw-bnk requested review from gosiastyba, rafkoch and artur-rs and removed request for artur-rs and rafkoch January 29, 2024 09:00
@gosiastyba
Copy link

gosiastyba commented Jan 29, 2024

@Stanislaw-bnk Przyznam, że nie jestem pewna, jakie mamy praktyki do mergowania w przypadku, gdy nie wszystkie checki są spełnione (tutaj ten nie jest: SEO CI / linkChecker (pull_request) ) (@artur-rs może pomożesz?) Poza tym jednym nie mam więcej uwag.
EDIT:
ENG: I admit that I'm not sure what practices we have for merging when not all checks are met (here this one is not: SEO CI / linkChecker (pull_request) ) (@artur-rs maybe you can help?) Apart from this one, I don't have any more comments.

@pietrushnic pietrushnic self-requested a review January 29, 2024 09:47
@pietrushnic
Copy link
Contributor

@gosiastyba This is a public repo where we use English. I already wrote internally what the issue is and how @Stanislaw-bnk should address that.

@Stanislaw-bnk
Copy link
Contributor Author

Stanislaw-bnk commented Jan 29, 2024

The issue with the broken link is in the style.html directory. It is indeed a 404, but I'm not quite sure to what website should I change it (https://fontawesome.com/ ?), and if the change won't affect anything negatively on the Dasharo website if I just delete the link.
The broken links checker:
docker run --init -it --rm -w $(pwd) -v $(pwd):$(pwd) lycheeverse/lychee --max-redirects 10 -a 403,429,500,502,503,999 when I tried to run it locally returned:

[sbieniek@3M11 dasharo-website]$ docker run --init -it --rm -w $(pwd) -v $(pwd):$(pwd) lycheeverse/lychee --max-redirects 10 -a 403,429,500,502,503,999
error: the following required arguments were not provided:
  <inputs>...

Usage: lychee --max-redirects <MAX_REDIRECTS> --accept <ACCEPT> <inputs>...

@pietrushnic
Copy link
Contributor

@Stanislaw-bnk about the broken link checker command, please create an issue and assign it to @Asiderr

Regarding fontawesome, did you happen to try ChatGPT like I suggested?
Have you tried to render the website locally after removing the fontawsome link?
Did the page work correctly?

@Stanislaw-bnk
Copy link
Contributor Author

Yes, I have just tried to delete the links, the page rendered correctly at first sight, didn't notice any change.
PR with the fix: #55

@Stanislaw-bnk
Copy link
Contributor Author

A new issue with the broken links checker: #56

@pietrushnic pietrushnic added this to the Dasharo Website v0.8.0 milestone Jan 29, 2024
@pietrushnic
Copy link
Contributor

@Stanislaw-bnk #55 merged.

@gosiastyba
Copy link

@gosiastyba This is a public repo where we use English.

@pietrushnic Understood. For clarity, I have included an English version of the comment.

@pietrushnic pietrushnic changed the base branch from main to develop January 29, 2024 13:36
@pietrushnic
Copy link
Contributor

@Stanislaw-bnk if you rebase on top of develop it should be fixed

@Asiderr
Copy link

Asiderr commented Jan 29, 2024

@Stanislaw-bnk @pietrushnic I responded in #56. 404 is an actual issue and must be fixed (not ignored) before merging.

@pietrushnic
Copy link
Contributor

404 is an actual issue and must be fixed (not ignored) before merging.

@Asiderr sounds like automatic reply, this is precisely what @Stanislaw-bnk did in #55

@Stanislaw-bnk
Copy link
Contributor Author

Stanislaw-bnk commented Jan 30, 2024

if you rebase on top of develop it should be fixed

@artur-rs Having a problem doing that, need a little help. Should I just follow the same instructions like for the 3mdeb website?
After successful deployment on the beta environment, if a whole set of patches is merged in the develop branch, open a new PR to main. The reporter will verify changes and publish prod env.
Would like to rebase the develop to main.
When trying to compare main to develop it states: main is up to date with all commits from develop
1

@pietrushnic
Copy link
Contributor

@Stanislaw-bnk No, you are not allowed to rebase the develop branch. Your changes are on tos-dasharo branch and that branch should b rebased on most recent develop. Please never touch your branches unless explicitly asked for that.

@pietrushnic
Copy link
Contributor

@Stanislaw-bnk @gosiastyba those changes were not merged, when you plan to fix this PR?

@Stanislaw-bnk
Copy link
Contributor Author

@Asiderr I would like to resolve the merge conflicts here, but the linkchecker says: The logs for this run have expired and are no longer available.. How should I proceed here?

@Asiderr
Copy link

Asiderr commented May 28, 2024

@Stanislaw-bnk You have to rerun this pipeline. Trigger once again all of the tests.

@Stanislaw-bnk
Copy link
Contributor Author

You have to rerun this pipeline. Trigger once again all of the tests.

How can I re-run the tests without making any additional changes in the file?

@Asiderr
Copy link

Asiderr commented May 28, 2024

@Stanislaw-bnk
Copy link
Contributor Author

Stanislaw-bnk commented May 28, 2024

Rerun job

I know, the problem is, there is no such option, only Create status badge.

@Stanislaw-bnk
Copy link
Contributor Author

@artur-rs Could you please help with the linkchecker fail here?

@artur-rs
Copy link
Member

artur-rs commented Jun 4, 2024

@Stanislaw-bnk I do not see this option as well, which is strange. Even the linkChecker log is empty.

@artur-rs
Copy link
Member

artur-rs commented Jun 4, 2024

@Stanislaw-bnk rebase did the work. Merging

@artur-rs artur-rs merged commit 663b4d2 into develop Jun 4, 2024
5 checks 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.

5 participants