10000 Merge branch 'master' into build-processing-error-TS-info · stackbuilders/circleci-docs@b571fb8 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit b571fb8

Browse files
michelle-lunamichelle-luna
authored
Merge branch 'master' into build-processing-error-TS-info
2 parents 185b32e + 64e2342 commit b571fb8

File tree

10 files changed

+386
-10
lines changed

10 files changed

+386
-10
lines changed

‎jekyll/_cci2/creating-orbs.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ circleci update install
499499
500500
Now that you have installed the CircleCI CLI, you will want to configure the CLI for use. The process for configuring the CLI is simple and straightforward, requiring you only to follow a few steps.
501501
502-
Before you can configure the CLI, you may need to first generate a CircleCI API token from the [Personal API Token tab](https://circleci.com/accounts/api):
502+
Before you can configure the CLI, you may need to first generate a CircleCI API token from the [Personal API Token tab](https://circleci.com/account/api):
503503
504504
```
505505
$ circleci setup
@@ -603,3 +603,10 @@ workflows:
603603
```
604604
605605
In this example, the `btd` workflow runs the `orb-tools/validate` job first. If the orb is indeed valid, the next step will execute, and `orb-tools/publish` will execute. When `orb-tools/publish` succeeds, the job input will contain a success message that the new orb has been published.
606+
607+
## See Also
608+
- Refer to [Using Orbs]({{site.baseurl}}/2.0/using-orbs/), for more about how to use existing orbs.
609+
- Refer to [Orbs FAQ]({{site.baseurl}}/2.0/orbs-faq/), where you will find answers to common questions.
610+
- Refer to [Reusing Config]({{site.baseurl}}/2.0/reusing-config/) for more detailed examples of reusable orbs, commands, parameters, and executors.
611+
- Refer to [Testing Orbs]({{site.baseurl}}/2.0/testing-orbs/) for information about how to test the orbs you have created.
612+
- Refer to [Orbs Registry](https://circleci.com/orbs/registry/licensing) for more detailed information about legal terms and conditions when using orbs.

‎jekyll/_cci2/google-auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
- image: google/cloud-sdk
112112
steps:
113113
- run: |
114-
echo $GCLOUD_SERVICE_KEY | sudo gcloud auth activate-service-account --key-file=-
114+
echo $GCLOUD_SERVICE_KEY | gcloud auth activate-service-account --key-file=-
115115
gcloud --quiet config set project ${GOOGLE_PROJECT_ID}
116116
gcloud --quiet config set compute/zone ${GOOGLE_COMPUTE_ZONE}
117117
```

‎jekyll/_cci2/nomad-metrics.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ echo "--------------------------------------"
161161
docker pull $CONTAINER_IMAGE
162162
docker rm -f $CONTAINER_NAME || true
163163

164-
# Not using --detach so that upstart can perform log management and process
165-
# monitoring
166164
docker run -d --name $CONTAINER_NAME \
167165
--rm \
168166
--net=host \

‎jekyll/_cci2/orbs-faq.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ To resolve this issue, go to "Settings -> Security -> Allow uncertified orbs" an
163163
**Note:** CircleCI does not require this for certified orbs (orbs that have been reviewed and approved by CircleCI prior to publishing). At this time, the certification program for orbs authored by third parties is not yet available, though will be available in the near future.
164164

165165
## See Also
166-
- Refer to [Orb Introduction]({{site.baseurl}}/2.0/orb-intro/), for a high-level overview.
167166
- Refer to [Using Orbs]({{site.baseurl}}/2.0/using-orbs/), for more about how to use existing orbs.
168167
- Refer to [Creating Orbs]({{site.baseurl}}/2.0/creating-orbs/), where you will find step-by-step instructions on how to create your own orb.
169168
- Refer to [Reusing Config]({{site.baseurl}}/2.0/reusing-config/) for more detailed examples of reusable orbs, commands, parameters, and executors.
169+
- Refer to [Testing Orbs]({{site.baseurl}}/2.0/testing-orbs/) for information about how to test the orbs you have created.
170+
- Refer to [Orbs Registry](https://circleci.com/orbs/registry/licensing) for more detailed information about legal terms and conditions when using orbs.

‎jekyll/_cci2/single-box.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ this access with `iptables` rules in a production setup, [contact support](https
4343
"sa-east-1": "ami-70026d1c",
4444
"us-east-1": "ami-cb6f1add",
4545
"us-east-2": "ami-57c7e032",
46-
"us-west-1": "ami-4fc8ee2f",
46+
"us-west-1": "ami-059b818564104e5c6",
4747
"us-west-2": "ami-c24a2fa2"
4848
};
4949

‎jekyll/_cci2/testing-orbs.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ In all cases, CircleCI recommends that you make use of the CircleCI CLI to valid
182182
For advanced testing, you may also want to use a shell unit testing framework such as BATS.
183183

184184
## See Also
185-
186-
* Refer to [Creating Orbs]({{site.baseurl}}//2.0/creating-orbs/#creating-inline-orbs) for more information on how to test your inline orbs.
187-
* Refer to [CircleCI CLI]({{ site.baseurl }}/2.0/local-cli/) for more detailed information on the CircleCI CLI and how to use the CLI for orb testing.
185+
- Refer to [Using Orbs]({{site.baseurl}}/2.0/using-orbs/), for more about how to use existing orbs.
186+
- Refer to [Creating Orbs]({{site.baseurl}}/2.0/creating-orbs/), where you will find step-by-step instructions on how to create your own orb.
187+
- Refer to the [Orbs FAQ]({{site.baseurl}}/2.0/orbs-faq/), where you will find answers to common questions.
188+
- Refer to [Reusing Config]({{site.baseurl}}/2.0/reusing-config/) for more detailed examples of reusable orbs, commands, parameters, and executors.
189+
- Refer to [Orbs Registry](https://circleci.com/orbs/registry/licensing) for more detailed information about legal terms and conditions when using orbs.

‎jekyll/_cci2_ja/caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ CircleCI 2.0 で利用できる、強力でカスタマイズ性の高い依存
186186
{% raw %}`{{ .Environment.variableName }}`{% endraw %} | `variableName` で示される環境変数 ([定義済み環境変数]({{ site.baseurl }}/ja/2.0/env-vars/)、もしくは[コンテキスト]({{ site.baseurl }}/ja/2.0/contexts)を指定できますが、ユーザー定義の環境変数は使えません)。
187187
{% raw %}`{{ checksum "filename" }}`{% endraw %} | filename で指定したファイル内容の SHA256 ハッシュを Base64 エンコードしたもの。ファイル内容に変更があるとキャッシュキーも新たに生成されます。 ここで指定できるのはリポジトリでコミットされているファイルに限られるため、 `package-lock.json` や `pom.xml`、もしくは `project.clj` などの依存関係を定義しているマニフェストファイルを使うことも検討してください。 また、`restore_cache` から `save_cache` までの処理でファイル内容が変わらないようにします。そうしないと `restore_cache` のタイミングで使われるファイルとは異なるキャッシュキーを元にキャッシュが保存されることになります。
188188
{% raw %}`{{ epoch }}`{% endraw %} | 協定世界時 (UTC) における 1970 年 1 月 1 日午前 0 時 0 分 0 秒からの経過秒数。POSIX 時間や UNIX 時間と同じです。
189-
{% raw %}`{{ arch }}`{% endraw %} | OS と CPU の種類。 OS や CPU アーキテクチャに合わせてコンパイル済みバイナリをキャッシュするような場合に用います。`darwin amd64` あるいは `linux amd64` のような文字列になります。 CircleCI で利用可能な CPU については[こちら]({{ site.baseurl }}/ja/2.0/faq/#which-cpu-architectures-does-circleci-support)を参照してください
189+
{% raw %}`{{ arch }}`{% endraw %} | OS と CPU の種類。 OS や CPU アーキテクチャに合わせてコンパイル済みバイナリをキャッシュするような場合に用います。`darwin amd64` あるいは `linux amd64` のような文字列になります。 CircleCI で利用可能な CPU については[こちら]({{ site.baseurl }}/ja/2.0/faq/#circleci-がサポートしている-cpu-アーキテクチャは)を参照してください
190190
{: class="table table-striped"}
191191

192192
**注：** キャッシュに対してユニークな識別子を定義する際には、{% raw %}`{{ epoch }}`{% endraw %} のような厳密すぎる値になるテンプレートをむやみに使わないよう注意してください。 {% raw %}`{{ .Branch }}`{% endraw %} や {% raw %}`{{ checksum "filename" }}`{% endraw %} といった汎用性の高い値になるテンプレートを使うと、使われるキャッシュの数は増えます。 これについては、以降で説明するようにトレードオフの関係にあると言えます。

0 commit comments

Comments
 (0)
0