Skip to content

Commit

Permalink
removing third party provider mention
Browse files Browse the repository at this point in the history
  • Loading branch information
flovntp committed Feb 22, 2024
1 parent 1354107 commit f26a8f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 61 deletions.
4 changes: 2 additions & 2 deletions sites/friday/src/get-started/here/configure/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ If you try to push a source code that is not {{% vendor/name %}} ready, the foll

{{< codetabs >}}
+++
title=Using {{% vendor/name %}} Git repository
title=Using {{% vendor/name %}} CLI
+++
```bash
Found 749 commits
Expand All @@ -91,7 +91,7 @@ E: Error: Invalid configuration files, aborting build
```
<--->
+++
title=Using third party provider
title=Using Console
+++
![Create project options](/images/console/first-fail.png "0.4")
{{< /codetabs >}}
Expand Down
59 changes: 0 additions & 59 deletions sites/friday/src/get-started/here/make-changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ To make changes to your project, follow these steps:

## 1. Create a new environment
Create a new environment (a Git branch) to make changes without impacting production:
{{< codetabs >}}
+++
title={{% vendor/name %}} Git repository
+++

Run the following command:
```bash {location="Terminal"}
Expand All @@ -26,38 +22,6 @@ Run the following command:
This creates a new local `feat-a` Git branch based on the `main` Git branch
and activates a related environment on {{< vendor/name >}}.
The new environment inherits the data (service data and assets) of its parent environment (the production environment here).
<--->
+++
title=Using third party provider
+++
{{% vendor/name %}} provides a feature called [source integration](integrations/source.html) that allows your {{% vendor/name %}} project to be fully integrated with your external repository.
This enables you, as a developer, to use a normal Git workflow (`git add . && git commit -m "message" && git push`) to deploy your environment—with no need to connect to the {{% vendor/name %}} Console.

Assuming you've already activated the source integration feature on your project, create a new branch:
```bash {location="Terminal"}
git checkout -b feat-a && git push -u origin feat-a
```
This creates a new local `feat-a` Git branch based on the `main` Git branch
and a related environment on {{< vendor/name >}}.
The new environment is inactive by default. Once you activate it, it will inherit the data (service data and assets) of its parent environment (the Production environment here).
{{< note >}}
When your local feature is ready, [activate your environment](/administration/cli/reference.html#environmentactivate).
{{< /note >}}
{{< note title="Warnings" theme="warning">}}
**First**, you are charged for all [activated environments](/administration/cli/reference.html#environmentactivate).
So, to create an inactive environment waiting for you to be ready to test, run the following command:
```bash {location="Terminal"}
git branch checkout -b feat-a && git push -u upsun feat-a
```
**Secondly**, if you have set up a [source integration](/integrations/source/_index.md), make sure you disable the `prune_branches` option (`true` by default). Otherwise, the `upsun branch` command fails at the end of the deployment.
This is due to the integration syncing with the source and deleting the new branch since it doesn't exist in the canonical source:
```bash {location="Terminal"}
fatal: couldn't find remote ref feat-a
```
{{< /note >}}
{{< /codetabs >}}

## 2. Make changes to your project

Expand All @@ -74,21 +38,9 @@ git commit -m "Update source code"
Deploy your changes to the `feat-a` environment:
{{< codetabs >}}
+++
title=Using {{% vendor/name %}} Git repository
+++
```bash {location="Terminal"}
{{% vendor/cli %}} push
```
<--->
+++
title=Using third party provider
+++
```bash {location="Terminal"}
git push origin
```
{{< /codetabs >}}
Note that each environment has its own domain name.
To open the URL of your new environment, run the following command:
Expand All @@ -108,10 +60,6 @@ Iterate by changing the code, committing, and deploying.
When satisfied with your changes, merge them to the main branch,
and remove the feature branch:
{{< codetabs >}}
+++
title=Using {{% vendor/name %}} Git repository
+++
```bash {location="Terminal"}
{{% vendor/cli %}} merge
Are you sure you want to merge feat-a into its parent, main? [Y/n] y
Expand All @@ -120,13 +68,6 @@ git pull {{% vendor/cli %}} main
{{% vendor/cli %}} environment:delete feat-a
git fetch --prune
```
<--->
+++
title=Using third party provider
+++
{{% note title="Warning" theme="warning" %}}
We strongly recommend to use Merge/Pull Request for merging your feature branch to the ``main`` branch.
{{% /note %}}
When using a third party provider, you can use the following:
```bash {location="Terminal"}
Expand Down

0 comments on commit f26a8f5

Please sign in to comment.