diff --git a/content/docs/draft/cbe-005_gitlab_ci/en.md b/content/docs/draft/cbe-005_gitlab_ci/en.md index 1f2d59bdb..52c789897 100644 --- a/content/docs/draft/cbe-005_gitlab_ci/en.md +++ b/content/docs/draft/cbe-005_gitlab_ci/en.md @@ -38,7 +38,7 @@ know you're managing your pipelines with CUE. | :exclamation: WARNING :exclamation: | |:--------------------------------------- | -| This guide requires that you use `cue` version `v0.11.0-alpha.2` or later. **The process described below won't work with earlier versions**. Check the version of your `cue` command by running `cue version`, and [upgrade it](https://cuelang.org/dl) if needed. +| This guide requires that you use `cue` version `v0.11.0-alpha.4` or later. **The process described below won't work with earlier versions**. Check the version of your `cue` command by running `cue version`, and [upgrade it](https://cuelang.org/dl) if needed. ## Prerequisites @@ -185,8 +185,8 @@ Convert the GitLab schema from JSON Schema to CUE: :computer: `terminal` {{{with script "en" "9"}}} -cue import jsonschema+strictFeatures=0: \ - internal/ci/gitlab/gitlab.cicd.pipeline.schema.json -p gitlab -l '#Pipeline:' +cue import -p gitlab -l '#Pipeline:' \ + internal/ci/gitlab/gitlab.cicd.pipeline.schema.json {{{end}}} This command will create the file `internal/ci/gitlab/gitlab.cicd.pipeline.schema.cue` @@ -298,7 +298,7 @@ diff ../12.expected.txt ../12.actual.txt | :exclamation: WARNING :exclamation: | |:--------------------------------------- | -| If you *don't* see the usage explanation for the `regenerate` workflow command (or if you receive an error message) then **either** your workflow command isn't set up as CUE requires, **or** you're running a CUE version older than `v0.11.0-alpha.2`. If you've [upgraded to at least that version](https://cuelang.org/dl) but the usage explanation still isn't being displayed then: (1) double check the contents of the `ci_tool.cue` file and the modifications you made to it; (2) make sure its location in the repository is precisely as given in this guide; (3) ensure the filename is *exactly* `ci_tool.cue`; (4) run `cue vet ./internal/ci/gitlab` and check that your pipelines actually validate successfully - in other words: were they truly valid before you even started this process? Lastly, make sure you've followed all the steps in this guide, and that you invoked the `cue help` command from the repository's root directory. If you get really stuck, please come and join [the CUE community](https://cuelang.org/community/) and ask for some help! +| If you *don't* see the usage explanation for the `regenerate` workflow command (or if you receive an error message) then **either** your workflow command isn't set up as CUE requires, **or** you're running a CUE version older than `v0.11.0-alpha.4`. If you've [upgraded to at least that version](https://cuelang.org/dl) but the usage explanation still isn't being displayed then: (1) double check the contents of the `ci_tool.cue` file and the modifications you made to it; (2) make sure its location in the repository is precisely as given in this guide; (3) ensure the filename is *exactly* `ci_tool.cue`; (4) run `cue vet ./internal/ci/gitlab` and check that your pipelines actually validate successfully - in other words: were they truly valid before you even started this process? Lastly, make sure you've followed all the steps in this guide, and that you invoked the `cue help` command from the repository's root directory. If you get really stuck, please come and join [the CUE community](https://cuelang.org/community/) and ask for some help! #### :arrow_right: Regenerate the YAML pipeline file diff --git a/content/docs/draft/cbe-005_gitlab_ci/gen_cache.cue b/content/docs/draft/cbe-005_gitlab_ci/gen_cache.cue index 21da394c5..fbd3d822d 100644 --- a/content/docs/draft/cbe-005_gitlab_ci/gen_cache.cue +++ b/content/docs/draft/cbe-005_gitlab_ci/gen_cache.cue @@ -15,8 +15,8 @@ package site "14": "U3CbYQ0viVRaklzhlEknDxcUj4/DtH1Ugwo7WxdCzl8=" } multi_step: { - hash: "1DE0U0BJVH0AIG8PBUF44NKCQC4GS1OM1G08S58CNQ3TUQ0KHM4G====" - scriptHash: "3S2NSE10ODTS7RUIO4HH6AJ2FNNJ5GPL1MQO8322VK0U5DN4QCUG====" + hash: "1IDAPD6OR11PR9O62REVB4P8R0U7PJ4IVBL79K13OCLNCVCD7P3G====" + scriptHash: "IVS5FP8VISFOJ2PF93OMKF2470LMT73GR58B5A29UT9N93GFK4OG====" steps: [{ doc: """ # Required because v0.10.0 suffers from https://cuelang.org/issue/3462, which @@ -144,7 +144,7 @@ package site output: "" }, { doc: "" - cmd: "cue import jsonschema+strictFeatures=0: internal/ci/gitlab/gitlab.cicd.pipeline.schema.json -p gitlab -l '#Pipeline:'" + cmd: "cue import -p gitlab -l '#Pipeline:' internal/ci/gitlab/gitlab.cicd.pipeline.schema.json" exitCode: 0 output: "" }, { diff --git a/content/docs/draft/cbe-006_buildkite_importing_pipelines/en.md b/content/docs/draft/cbe-006_buildkite_importing_pipelines/en.md index 9450abb85..f812751b3 100644 --- a/content/docs/draft/cbe-006_buildkite_importing_pipelines/en.md +++ b/content/docs/draft/cbe-006_buildkite_importing_pipelines/en.md @@ -181,7 +181,6 @@ mv ./.buildkite/*.cue internal/ci/buildkite ### Validate workflows