diff --git a/README-ja.md b/README-ja.md index a43ab27f..9bcf0d7a 100644 --- a/README-ja.md +++ b/README-ja.md @@ -72,7 +72,7 @@ - Environment、AWS region、IAM role は [workflow-config.yaml](workflow-config.yaml) で定義する。環境の追加・削除は同ファイルの編集で行う。 - [workflow-config.yaml](workflow-config.yaml) の `apply_trigger` が environment を apply するタイミングを決める。`merge` は `main` への push、`release` は service の release 公開時に apply する。 - 認証は GitHub OIDC。[aws/github-oidc-auth/](aws/github-oidc-auth/) が environment ごとの plan / apply role を発行し、executor がそれを引き受ける。 -- `platform` の GitHub environment `production` は tag pattern `*-v*` に一致する ref からの deployment だけを受け付け、`monorepo` の `production` はどの ref からの deployment も受け付けない。これらの設定は [github/repository/](github/repository/) で管理する。 +- `platform` と `monorepo` の GitHub environment `production` は、tag pattern `*-v*` に一致する ref からの deployment だけを受け付ける。これらの設定は [github/repository/](github/repository/) で管理する。 - Terragrunt の remote state は S3 + DynamoDB に保存される。bucket / lock table 名は各 `aws/{service}/root.hcl`(および [github/](github/) 配下の同等ファイル)で定義される。 ### Pipeline Flow diff --git a/README.md b/README.md index 9dfc5027..8f159a8c 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ A PR labeled by `panicboat/deploy-actions` is resolved against [workflow-config. - Environments, AWS regions, and IAM roles are defined in [workflow-config.yaml](workflow-config.yaml). Adding or removing an environment means editing that file. - `apply_trigger` in [workflow-config.yaml](workflow-config.yaml) decides when an environment is applied: `merge` applies on push to `main`, `release` applies when the service release is published. - Authentication uses GitHub OIDC. [aws/github-oidc-auth/](aws/github-oidc-auth/) issues per-environment plan / apply roles that the executors assume. -- The GitHub environment `production` of `platform` accepts deployments only from refs that match the tag pattern `*-v*`, and that of `monorepo` accepts deployments from no ref. The settings are managed in [github/repository/](github/repository/). +- The GitHub environment `production` of both `platform` and `monorepo` accepts deployments only from refs that match the tag pattern `*-v*`. The settings are managed in [github/repository/](github/repository/). - Terragrunt remote state lives in S3 + DynamoDB; bucket and lock-table names are defined in each `aws/{service}/root.hcl` (and the equivalent under [github/](github/)). ### Pipeline Flow diff --git a/github/repository/master/monorepo.hcl b/github/repository/master/monorepo.hcl index 2eec5343..99a279f8 100644 --- a/github/repository/master/monorepo.hcl +++ b/github/repository/master/monorepo.hcl @@ -9,6 +9,6 @@ locals { wiki = false projects = true } - environments = { production = { deployment_tag_patterns = [] } } + environments = { production = { deployment_tag_patterns = ["*-v*"] } } } }