Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0466372d
Commit
0466372d
authored
Sep 27, 2021
by
Achilleas Pipinellis
Committed by
Russell Dickenson
Sep 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename master to main in the release group docs
parent
f98d4700
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
doc/ci/examples/deployment/index.md
doc/ci/examples/deployment/index.md
+4
-4
doc/user/project/pages/introduction.md
doc/user/project/pages/introduction.md
+3
-3
No files found.
doc/ci/examples/deployment/index.md
View file @
0466372d
...
@@ -69,7 +69,7 @@ staging:
...
@@ -69,7 +69,7 @@ staging:
-
gem install dpl
-
gem install dpl
-
dpl --provider=heroku --app=my-app-staging --api_key=$HEROKU_STAGING_API_KEY
-
dpl --provider=heroku --app=my-app-staging --api_key=$HEROKU_STAGING_API_KEY
only
:
only
:
-
ma
ster
-
ma
in
```
```
The first line
`apt-get update -yq`
updates the list of available packages,
The first line
`apt-get update -yq`
updates the list of available packages,
...
@@ -81,7 +81,7 @@ The above example is valid for all Debian-compatible systems.
...
@@ -81,7 +81,7 @@ The above example is valid for all Debian-compatible systems.
It's pretty common in the development workflow to have staging (development) and
It's pretty common in the development workflow to have staging (development) and
production environments
production environments
Let's consider the following example: we would like to deploy the
`ma
ster
`
Let's consider the following example: we would like to deploy the
`ma
in
`
branch to
`staging`
and all tags to the
`production`
environment.
branch to
`staging`
and all tags to the
`production`
environment.
The final
`.gitlab-ci.yml`
for that setup would look like this:
The final
`.gitlab-ci.yml`
for that setup would look like this:
...
@@ -92,7 +92,7 @@ staging:
...
@@ -92,7 +92,7 @@ staging:
-
gem install dpl
-
gem install dpl
-
dpl --provider=heroku --app=my-app-staging --api_key=$HEROKU_STAGING_API_KEY
-
dpl --provider=heroku --app=my-app-staging --api_key=$HEROKU_STAGING_API_KEY
only
:
only
:
-
ma
ster
-
ma
in
production
:
production
:
stage
:
deploy
stage
:
deploy
...
@@ -105,7 +105,7 @@ production:
...
@@ -105,7 +105,7 @@ production:
We created two deploy jobs that are executed on different events:
We created two deploy jobs that are executed on different events:
-
`staging`
: Executed for all commits pushed to the
`ma
ster
`
branch
-
`staging`
: Executed for all commits pushed to the
`ma
in
`
branch
-
`production`
: Executed for all pushed tags
-
`production`
: Executed for all pushed tags
We also use two secure variables:
We also use two secure variables:
...
...
doc/user/project/pages/introduction.md
View file @
0466372d
...
@@ -118,7 +118,7 @@ pages:
...
@@ -118,7 +118,7 @@ pages:
paths
:
paths
:
-
public
-
public
only
:
only
:
-
ma
ster
-
ma
in
```
```
### `.gitlab-ci.yml` for a static site generator
### `.gitlab-ci.yml` for a static site generator
...
@@ -133,7 +133,7 @@ the `pages` job with the [`only` parameter](../../../ci/yaml/index.md#only--exce
...
@@ -133,7 +133,7 @@ the `pages` job with the [`only` parameter](../../../ci/yaml/index.md#only--exce
whenever a new commit is pushed to a branch used specifically for your
whenever a new commit is pushed to a branch used specifically for your
pages.
pages.
That way, you can have your project's code in the
`ma
ster
`
branch and use an
That way, you can have your project's code in the
`ma
in
`
branch and use an
orphan branch (let's name it
`pages`
) to host your static generator site.
orphan branch (let's name it
`pages`
) to host your static generator site.
You can create a new empty branch like this:
You can create a new empty branch like this:
...
@@ -163,7 +163,7 @@ pages:
...
@@ -163,7 +163,7 @@ pages:
-
pages
-
pages
```
```
See an example that has different files in the
[
`ma
ster` branch
](
https://gitlab.com/pages/jekyll-branched/tree/master
)
See an example that has different files in the
[
`ma
in` branch
](
https://gitlab.com/pages/jekyll-branched/tree/main
)
and the source files for Jekyll are in a
[
`pages` branch
](
https://gitlab.com/pages/jekyll-branched/tree/pages
)
which
and the source files for Jekyll are in a
[
`pages` branch
](
https://gitlab.com/pages/jekyll-branched/tree/pages
)
which
also includes
`.gitlab-ci.yml`
.
also includes
`.gitlab-ci.yml`
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment