diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
commit | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (patch) | |
tree | ef3decbed644db3c97dcdbb5b71d4ade77f3155d /doc/ci/examples | |
parent | 79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/examples')
-rw-r--r-- | doc/ci/examples/artifactory_and_gitlab/index.md | 6 | ||||
-rw-r--r-- | doc/ci/examples/deployment/README.md | 4 | ||||
-rw-r--r-- | doc/ci/examples/laravel_with_gitlab_and_envoy/index.md | 2 | ||||
-rw-r--r-- | doc/ci/examples/php.md | 2 | ||||
-rw-r--r-- | doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md | 18 |
5 files changed, 16 insertions, 16 deletions
diff --git a/doc/ci/examples/artifactory_and_gitlab/index.md b/doc/ci/examples/artifactory_and_gitlab/index.md index e5f307e570d..aceceb7881a 100644 --- a/doc/ci/examples/artifactory_and_gitlab/index.md +++ b/doc/ci/examples/artifactory_and_gitlab/index.md @@ -39,7 +39,7 @@ project: 1. Create a new project by selecting **Import project from ➔ Repo by URL** 1. Add the following URL: - ``` + ```plaintext https://gitlab.com/gitlab-examples/maven/simple-maven-dep.git ``` @@ -164,7 +164,7 @@ The deployment occurs only if we're pushing or merging to `master` branch, so th Done! Now you have all the changes in the GitLab repo, and a pipeline has already been started for this commit. In the **Pipelines** tab you can see what's happening. If the deployment has been successful, the deploy job log will output: -``` +```plaintext [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ @@ -188,7 +188,7 @@ We'll use again a Maven app that can be cloned from our example project: 1. Create a new project by selecting **Import project from ➔ Repo by URL** 1. Add the following URL: - ``` + ```plaintext https://gitlab.com/gitlab-examples/maven/simple-maven-app.git ``` diff --git a/doc/ci/examples/deployment/README.md b/doc/ci/examples/deployment/README.md index dca11c40524..01dca801fbc 100644 --- a/doc/ci/examples/deployment/README.md +++ b/doc/ci/examples/deployment/README.md @@ -18,7 +18,7 @@ To use Dpl you need at least Ruby 1.9.3 with ability to install gems. Dpl can be installed on any machine with: -``` +```shell gem install dpl ``` @@ -27,7 +27,7 @@ having to test it on a CI server. If you don't have Ruby installed you can do it on Debian-compatible Linux with: -``` +```shell apt-get update apt-get install ruby-dev ``` diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md index b8f191570bc..bf7aec7107f 100644 --- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md +++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md @@ -163,7 +163,7 @@ sudo nano /etc/nginx/sites-available/default The configuration should be like this. -``` +```nginx server { root /var/www/app/current/public; server_name example.com; diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index db039b746e3..04a6a4ddef2 100644 --- a/doc/ci/examples/php.md +++ b/doc/ci/examples/php.md @@ -179,7 +179,7 @@ user following [the upstream installation guide][phpenv-installation]. Using phpenv also allows to easily configure the PHP environment with: -``` +```shell phpenv config-add my_config.ini ``` diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md index 557ebad72ba..4ffb29af512 100644 --- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md +++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md @@ -115,7 +115,7 @@ mix ecto.create We expect to see this output at the end of the command: -```shell +```plaintext Generated hello_gitlab_ci app The database for HelloGitlabCi.Repo has been created ``` @@ -136,7 +136,7 @@ mix phoenix.server This will be the output to this command: -```shell +```plaintext [info] Running HelloGitlabCi.Endpoint with Cowboy using http://localhost:4000 23 May 11:44:35 - info: compiling 23 May 11:44:37 - info: compiled 6 files into 2 files, copied 3 in 9.8 sec @@ -229,7 +229,7 @@ mix test Our expected result is this: -```shell +```plaintext .... Finished in 0.7 seconds @@ -265,20 +265,20 @@ project. As we are focusing on testing (not deploying), you can use the [elixir:latest](https://hub.docker.com/_/elixir) docker image, which already has the dependencies for running Phoenix tests installed, such as Elixir and Erlang: - ```yml + ```yaml image: elixir:latest ``` - We'll only use `postgres`, so we can delete the `mysql` and `redis` lines from the `services` section: - ```yml + ```yaml services: - postgres:latest ``` - Now, we'll create a new section called `variables`, before the `before_script` section: - ```yml + ```yaml variables: POSTGRES_DB: hello_gitlab_ci_test POSTGRES_HOST: postgres @@ -293,7 +293,7 @@ project. - In the `before_script` section, we'll add some commands to prepare everything for the test: - ```yml + ```yaml before_script: - mix local.rebar --force - mix local.hex --force @@ -310,7 +310,7 @@ project. Let's take a look at the updated file after the changes: -```yml +```yaml image: elixir:latest services: @@ -353,7 +353,7 @@ actual running build job. Click on build's ID to watch the entire process. If everything went as expected, we can wait for the **Build succeeded** at the end of the process! :) -``` +```shell $ mix test .... |