diff --git a/circle_ci/1-configure.md b/circle_ci/1-configure.md index 0526cbb..5214d16 100644 --- a/circle_ci/1-configure.md +++ b/circle_ci/1-configure.md @@ -23,14 +23,14 @@ You will need to complete all of the setup instructions [here](./readme.md#confi - Run the following command: `gh valet configure`. - Using the down arrow key to highlight `CircleCI`, press the spacebar to select, and then hit enter to continue. - At the GitHub handle prompt, enter the GitHub username used to generate the GitHub PAT in step 2 and press enter. - - At the GitHub Container Registry prompt enter the GitHub PAT generated in step 1 and press enter. - - At the GitHub PAT prompt enter the GitHub PAT generated in step 1 and press enter. - - At the GitHub url prompt enter the GitHub instance url or hit enter to accept the default value (`https://github.com`). - - At the CircleCI token prompt enter the CircleCI access token from step 2 and press enter. - - At the CircleCI base url prompt hit enter to accept the default value (`https://circleci.com`). - - At the CircleCI organization name prompt enter `labs-data`. This is the organization we'll be using throughout these labs. - - At the access token to fetch source code in GitHub prompt enter the GitHub PAT generated in step 1 and press enter. - - At the GitHub instance url containing source code prompt press enter to accept the default value (`https://github.com`). + - At the GitHub Container Registry prompt, enter the GitHub PAT generated in step 1 and press enter. + - At the GitHub PAT prompt, enter the GitHub PAT generated in step 1 and press enter. + - At the GitHub url prompt, enter the GitHub instance url or hit enter to accept the default value (`https://github.com`). + - At the CircleCI token prompt, enter the CircleCI access token from step 2 and press enter. + - At the CircleCI base url prompt, hit enter to accept the default value (`https://circleci.com`). + - At the CircleCI organization name prompt, enter `valet-labs`. This is the organization we'll be using throughout these labs. + - At the access token to fetch source code in GitHub prompt, enter the GitHub PAT generated in step 1 and press enter. + - At the GitHub instance url containing source code prompt, press enter to accept the default value (`https://github.com`). ![configure-screenshot](https://user-images.githubusercontent.com/18723510/188935436-308fa6d3-6eb7-48b9-bbf0-20ab0cdae411.png) @@ -46,7 +46,8 @@ To verify our environment is configured correctly, we are going to run the `upda 2. You should see a confirmation that you were logged into the GitHub Container Registry and Valet was updated to the latest version. - ```bash + ```console + $ gh valet version Login Succeeded latest: Pulling from valet-customers/valet-cli Digest: sha256:a7d00dee8a37e25da59daeed44b1543f476b00fa2c41c47f48deeaf34a215bbb diff --git a/circle_ci/2-audit.md b/circle_ci/2-audit.md index 30e0663..1e954ef 100644 --- a/circle_ci/2-audit.md +++ b/circle_ci/2-audit.md @@ -9,15 +9,15 @@ The `audit` command will perform the following steps: ## Prerequisites -1. Followed the steps [here](./readme.md#configure-your-codespace) to set up your Codespace environment. +1. Followed the steps [here](./readme.md#configure-your-codespace) to set up your GitHub Codespaces environment. 2. Completed the [configure lab](./1-configure.md#configure-credentials-for-valet). ## Perform an audit -You will be performing an `audit` for the __labs-data__ CircleCI organization that was created for the purposes of these labs. Your environment was configured to use this organization during the [configure lab](./1-configure.md). The remaining information needed to perform an `audit` is: +You will be performing an `audit` for the __valet-labs__ CircleCI organization that was created for the purposes of these labs. Your environment was configured to use this organization during the [configure lab](./1-configure.md). The remaining information needed to perform an `audit` is: 1. Where do we want to store the result? - - __./tmp/audit__. This can be any path within the working directory that Valet commands are executed from. + - __tmp/audit__. This can be any path within the working directory that Valet commands are executed from. ### Steps @@ -146,42 +146,42 @@ The final section of the audit report provides a manifest of all of the files th ```md ### Successful -#### labs-data/circleci-hello-world +#### valet-labs/circleci-hello-world -- [labs-data/circleci-hello-world/say-hello-workflow.yml](labs-data/circleci-hello-world/say-hello-workflow.yml) -- [labs-data/circleci-hello-world.config.json](labs-data/circleci-hello-world.config.json) -- [labs-data/circleci-hello-world.source.yml](labs-data/circleci-hello-world.source.yml) +- [valet-valet-labs/circleci-hello-world/say-hello-workflow.yml](valet-labs/circleci-hello-world/say-hello-workflow.yml) +- [valet-labs/circleci-hello-world.config.json](valet-labs/circleci-hello-world.config.json) +- [valet-labs/circleci-hello-world.source.yml](valet-labs/circleci-hello-world.source.yml) -#### labs-data/circleci-command-example +#### valet-labs/circleci-command-example -- [labs-data/circleci-command-example/my-workflow.yml](labs-data/circleci-command-example/my-workflow.yml) +- [valet-labs/circleci-command-example/my-workflow.yml](valet-labs/circleci-command-example/my-workflow.yml) - [.github/actions/greeting/action.yml](.github/actions/greeting/action.yml) -- [labs-data/circleci-command-example.config.json](labs-data/circleci-command-example.config.json) -- [labs-data/circleci-command-example.source.yml](labs-data/circleci-command-example.source.yml) +- [valet-labs/circleci-command-example.config.json](valet-labs/circleci-command-example.config.json) +- [valet-labs/circleci-command-example.source.yml](valet-labs/circleci-command-example.source.yml) -#### labs-data/circleci-node-example +#### valet-labs/circleci-node-example -- [labs-data/circleci-node-example/sample.yml](labs-data/circleci-node-example/sample.yml) -- [labs-data/circleci-node-example.config.json](labs-data/circleci-node-example.config.json) -- [labs-data/circleci-node-example.source.yml](labs-data/circleci-node-example.source.yml) +- [valet-labs/circleci-node-example/sample.yml](valet-labs/circleci-node-example/sample.yml) +- [valet-labs/circleci-node-example.config.json](valet-labs/circleci-node-example.config.json) +- [valet-labs/circleci-node-example.source.yml](valet-labs/circleci-node-example.source.yml) -#### labs-data/circleci-python-example +#### valet-labs/circleci-python-example -- [labs-data/circleci-python-example/sample.yml](labs-data/circleci-python-example/sample.yml) -- [labs-data/circleci-python-example.config.json](labs-data/circleci-python-example.config.json) -- [labs-data/circleci-python-example.source.yml](labs-data/circleci-python-example.source.yml) +- [valet-labs/circleci-python-example/sample.yml](valet-labs/circleci-python-example/sample.yml) +- [valet-labs/circleci-python-example.config.json](valet-labs/circleci-python-example.config.json) +- [valet-labs/circleci-python-example.source.yml](valet-labs/circleci-python-example.source.yml) -#### labs-data/circleci-demo-java-spring +#### valet-labs/circleci-demo-java-spring -- [labs-data/circleci-demo-java-spring/workflow.yml](labs-data/circleci-demo-java-spring/workflow.yml) -- [labs-data/circleci-demo-java-spring.config.json](labs-data/circleci-demo-java-spring.config.json) -- [labs-data/circleci-demo-java-spring.source.yml](labs-data/circleci-demo-java-spring.source.yml) +- [valet-labs/circleci-demo-java-spring/workflow.yml](valet-labs/circleci-demo-java-spring/workflow.yml) +- [valet-labs/circleci-demo-java-spring.config.json](valet-labs/circleci-demo-java-spring.config.json) +- [valet-labs/circleci-demo-java-spring.source.yml](valet-labs/circleci-demo-java-spring.source.yml) -#### labs-data/circleci-demo-ruby-rails +#### valet-labs/circleci-demo-ruby-rails -- [labs-data/circleci-demo-ruby-rails/build_and_test.yml](labs-data/circleci-demo-ruby-rails/build_and_test.yml) -- [labs-data/circleci-demo-ruby-rails.config.json](labs-data/circleci-demo-ruby-rails.config.json) -- [labs-data/circleci-demo-ruby-rails.source.yml](labs-data/circleci-demo-ruby-rails.source.yml) +- [valet-labs/circleci-demo-ruby-rails/build_and_test.yml](valet-labs/circleci-demo-ruby-rails/build_and_test.yml) +- [valet-labs/circleci-demo-ruby-rails.config.json](valet-labs/circleci-demo-ruby-rails.config.json) +- [valet-labs/circleci-demo-ruby-rails.source.yml](valet-labs/circleci-demo-ruby-rails.source.yml) ``` Each pipeline will have a variety of files written that include: diff --git a/circle_ci/4-dry-run.md b/circle_ci/4-dry-run.md index 6860d68..e2f07aa 100644 --- a/circle_ci/4-dry-run.md +++ b/circle_ci/4-dry-run.md @@ -13,7 +13,7 @@ In this lab you will use the `dry-run` command to convert a CircleCI pipeline to You will be performing a dry run migration against a CircleCI project. Answer the following questions before running this command: 1. What project do you want to convert? - - __circleci-demo-ruby-rails__. This is one of the sample projects avaiable in the CircleCI labs-data organization. + - __circleci-demo-ruby-rails__. This is one of the sample projects avaiable in the CircleCI valet-labs organization. 2. Where do you want to store the result? - __./tmp/dry-run-lab__. This can be any path within the working directory that Valet commands are executed from. @@ -32,7 +32,7 @@ You will be performing a dry run migration against a CircleCI project. Answer th ![command-result](https://user-images.githubusercontent.com/18723510/189911131-bf6bfd6f-2b5e-4e49-8d14-95ef9c312117.png) 4. View the converted workflow: - - Find `./tmp/dry-run-lab/labs-data/circleci-demo-ruby-rails` in the file explorer pane in your codespace. + - Find `./tmp/dry-run-lab/valet-labs/circleci-demo-ruby-rails` in the file explorer pane in your codespace. - Click `build_and_test.yml` to open. ## Inspect the output files @@ -109,7 +109,7 @@ workflows: Converted workflow 👇 ```yaml -name: labs-data/circleci-demo-ruby-rails/build_and_test +name: valet-labs/circleci-demo-ruby-rails/build_and_test on: push: branches: diff --git a/circle_ci/5-custom-transformers.md b/circle_ci/5-custom-transformers.md index f6da2f0..d864d71 100644 --- a/circle_ci/5-custom-transformers.md +++ b/circle_ci/5-custom-transformers.md @@ -27,7 +27,7 @@ The converted workflow that is generated by the above command can be seen below: Converted workflow 👇 ```yaml -name: labs-data/circleci-node-example/sample +name: valet-labs/circleci-node-example/sample on: push: branches: