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

Update .gitlab-ci json file #1901

Merged
merged 4 commits into from Nov 9, 2021
Merged

Conversation

dov0211
Copy link
Contributor

@dov0211 dov0211 commented Oct 25, 2021

link .gitlab-ci.json to the original GitLab file here https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/assets/javascripts/editor/schema/ci.json

Close #1782
Close #1529
Close #1476
Close #989

@dov0211 dov0211 changed the title Update .gitlab-ci.yml Update .gitlab-ci json file Oct 25, 2021
@GerryFerdinandus
Copy link
Contributor

Just open an issue at gitlab.
Ask permission to link only to the file and not to use the local schemastore copy.

@dov0211
Copy link
Contributor Author

dov0211 commented Nov 3, 2021

Just open an issue at gitlab. Ask permission to link only to the file and not to use the local schemastore copy.

@GerryFerdinandus we've left you few comments in the issue you've opened https://gitlab.com/gitlab-org/gitlab/-/issues/343819#note_721836190

@GerryFerdinandus
Copy link
Contributor

@dov0211 (GitLab Product Manager)
You can update the commit of this PR with these steps:

  1. delete one file
    src/schemas/json/gitlab-ci.json
  2. delete two test folder.
    src/test/gitlab-ci/
    src/negative_test/gitlab-ci/
  3. change URL to the plain/raw file version
    https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json
    {
    "name": "gitlab-ci",
    "description": "JSON schema for configuring Gitlab CI",
    "fileMatch": [
    "*.gitlab-ci.yml"
    ],
    "url": "https://json.schemastore.org/gitlab-ci.json"
    },

Add these 4 extra lines to your PR text to close these GitLab-related issues at the merge step.
Close #1782
Close #1529
Close #1476
Close #989

Also nice to add additional comments to the GitLab user, if you like.
Include default comment in each of these 4 GitLab issues, that the GitLab schema has been migrated.
And if the problem/question still exists they should open it in the GitLab forum etc.

Remark:
GitLab should copy the two GitLab test file directories. I don't see it there.
GitLab should have a JSON schema validator on the server.
Perhaps a validator is already active, but without using test files.

@GerryFerdinandus
Copy link
Contributor

@dov0211
The commit schemastore/src/api/json/catalog.json is wrong
You must only change ONE line with the URL
Line 1251 in my example to
https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json

@GerryFerdinandus
Copy link
Contributor

@dov0211
There is an merge conflict. You are working from a branch that has been updated to July 2021, which is too old to get a good merge result.

dov0211 and others added 2 commits November 9, 2021 11:09
bring it in par with the official gitlab schema
@dov0211
Copy link
Contributor Author

dov0211 commented Nov 9, 2021

@GerryFerdinandus I've done the necessary changes. Hopefully should be good now

@GerryFerdinandus
Copy link
Contributor

@dov0211
You forgot to delete file
src/schemas/json/gitlab-ci.json
After this fix it should be fine.

@dov0211
Copy link
Contributor Author

dov0211 commented Nov 9, 2021

@GerryFerdinandus Done

@GerryFerdinandus
Copy link
Contributor

@dov0211
build failed because you forgot to delete folders


################ Error message
>> Found test folder "gitlab-ci" with no schema file: schemas/json/gitlab-ci.json
##############################
Warning: See error message above this line.� Use --force to continue.

delete two test folder.
src/test/gitlab-ci/
src/negative_test/gitlab-ci/

@dov0211
Copy link
Contributor Author

dov0211 commented Nov 9, 2021

Back to you @GerryFerdinandus 🏓

@GerryFerdinandus
Copy link
Contributor

@madskristensen This can be merge

@madskristensen madskristensen merged commit 6b7856d into SchemaStore:master Nov 9, 2021
@madskristensen
Copy link
Contributor

Thanks

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