From 2ead842c21bd33325a29042e267ddd9f2646fa7f Mon Sep 17 00:00:00 2001 From: Jennifer Kerns <47341891+JenniferKerns@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:17:43 -0800 Subject: [PATCH 1/2] copyedits to configure lab Note: I can't tell how to fix the too-big spacing between the sub-bullets under step 5. --- gitlab/1-configure.md | 56 +++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gitlab/1-configure.md b/gitlab/1-configure.md index 07e8056..d049727 100644 --- a/gitlab/1-configure.md +++ b/gitlab/1-configure.md @@ -13,39 +13,39 @@ You will need to complete all of the setup instructions [here](./readme.md#confi ``` 2. Open the GitLab server in a new browser tab: - - Click the `PORTS` tab in the codespace terminal window. - - In the `PORTS` tab find the row for port 80. - - Hover over the address under the `Local Address` column and click the globe to "open in browser". + - Click the `PORTS` tab in the codespace terminal window. + - In the `PORTS` tab find the row for port 80. + - Hover over the address under the `Local Address` column and click the globe to "open in browser". 3. Create a GitLab personal access token (PAT): - - Authenticate with the GitLab server using the following credentials: - - Username: `root` - - Password: `actions-importer-labs!` - - Follow the GitLab [instructions](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token) to generate a PAT. - - Ensure the token has the `read_api` scope. - - Copy the generated token and save it in a safe location. + - Authenticate with the GitLab server using the following credentials: + - Username: `root` + - Password: `actions-importer-labs!` + - Follow the GitLab [instructions](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#create-a-personal-access-token) to generate a PAT. + - Ensure the token has the `read_api` scope. + - Copy the generated token and save it in a safe location. 4. Create a GitHub personal access token (PAT): - - Open github.com in a new browser tab. - - In the top right corner of the UI, click your profile photo and click `Settings`. - - In the left panel, click `Developer Settings`. - - Click `Personal access tokens` and then `Legacy tokens` (if present). - - Click `Generate new token` and then `Generate new legacy token`. You may be required to authenticate with GitHub during this step. - - Name your token in the `Note` field. - - Select the following scopes: `workflow` and `read:packages`. - - Click `Generate token`. - - Copy the generated PAT and save it in a safe location. + - Open github.com in a new browser tab. + - In the top right corner of the UI, click your profile photo and then click `Settings`. + - In the left panel, click `Developer Settings`. + - Click `Personal access tokens` and then `Tokens (classic)` (if present). + - Click `Generate new token` and then `Generate new token (classic)`. You may be required to authenticate with GitHub during this step. + - Name your token in the `Note` field. + - Select the following scopes: `workflow` and `read:packages`. + - Click `Generate token`. + - Copy the generated PAT and save it in a safe location. 5. Run the `configure` CLI command: - - Select the `TERMINAL` tab from within the codespace terminal window. - - Run the following command: `gh actions-importer configure`. - - Use the down arrow key to highlight `GitLab`, press the spacebar to select, and then press enter to continue. - - At the GitHub handle prompt, enter the GitHub handle 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 4 and press enter. - - At the GitHub PAT prompt, enter the GitHub PAT generated in step 4 and press enter. - - At the GitHub URL prompt, enter the GitHub instance URL or press enter to accept the default value (`https://github.com`). - - At the GitLab token prompt, enter the GitLab access token from step 3 and press enter. - - At the GitLab URL prompt, enter `http://localhost` and press enter. + - Select the `TERMINAL` tab from within the codespace terminal window. + - Run the following command: `gh actions-importer configure`. + - Use the down arrow key to highlight `GitLab`, press the spacebar to select, and then press enter to continue. + - At the GitHub handle prompt, enter the GitHub handle 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 4 and press enter. + - At the GitHub PAT prompt, enter the GitHub PAT generated in step 4 and press enter. + - At the GitHub URL prompt, enter the GitHub instance URL or press enter to accept the default value (`https://github.com`). + - At the GitLab token prompt, enter the GitLab access token from step 3 and press enter. + - At the GitLab URL prompt, enter `http://localhost` and press enter. ```console $ gh actions-importer configure @@ -64,7 +64,7 @@ You will need to complete all of the setup instructions [here](./readme.md#confi To verify your environment is configured correctly, run the `update` CLI command. The `update` CLI command will download the latest version of GitHub Actions Importer to your codespace. -1. In the codespace terminal run the following command: +1. In the codespace terminal, run the following command: ```bash gh actions-importer update From d077fe9773eb8c16486628a65687f273f60ffaf2 Mon Sep 17 00:00:00 2001 From: Ethan Dennis Date: Mon, 7 Nov 2022 11:02:16 -0800 Subject: [PATCH 2/2] Update 1-configure.md --- gitlab/1-configure.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gitlab/1-configure.md b/gitlab/1-configure.md index d049727..4273b10 100644 --- a/gitlab/1-configure.md +++ b/gitlab/1-configure.md @@ -47,18 +47,18 @@ You will need to complete all of the setup instructions [here](./readme.md#confi - At the GitLab token prompt, enter the GitLab access token from step 3 and press enter. - At the GitLab URL prompt, enter `http://localhost` and press enter. - ```console - $ gh actions-importer configure - ✔ Which CI providers are you configuring?: GitLab - Enter the following values (leave empty to omit): - ✔ GitHub handle used to authenticate with the GitHub Container Registry: mona - ✔ Personal access token to authenticate with the GitHub Container Registry: *************** - ✔ Personal access token for GitHub: *************** - ✔ Base url of the GitHub instance: https://github.com - ✔ Private token for GitLab: *************** - ✔ Base url of the GitLab instance: http://localhost - Environment variables successfully updated. - ``` + ```console + $ gh actions-importer configure + ✔ Which CI providers are you configuring?: GitLab + Enter the following values (leave empty to omit): + ✔ GitHub handle used to authenticate with the GitHub Container Registry: mona + ✔ Personal access token to authenticate with the GitHub Container Registry: *************** + ✔ Personal access token for GitHub: *************** + ✔ Base url of the GitHub instance: https://github.com + ✔ Private token for GitLab: *************** + ✔ Base url of the GitLab instance: http://localhost + Environment variables successfully updated. + ``` ## Verify your environment