diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index a2bef7c..a72f2ac 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -92,7 +92,7 @@ jobs: - name: Backup tfstate to artifact if: github.ref == 'refs/heads/production' && github.event_name == 'push' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: terraform.tfstate path: terraform.tfstate diff --git a/README.md b/README.md index bf4befa..cf58119 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,9 @@ Manage github membership by Terraform ### Sample flow -1. fork this repo. -1. edit members.tf and team-ictsc6.tf like [this](https://github.com/ictsc/ictsc-github-member/pull/5). -1. create pull req. +1. clone this repo. +2. Cut branches and edit team-ictsc20xx.tf, github.tf and team-admin.tf like [this](https://github.com/ictsc/ictsc-github-member/pull/230). +3. create pull req to master. +4. marge pull req. +5. create pull req to production. +6. marge pull req. diff --git a/github.tf b/github.tf index 56de4f0..71669c2 100644 --- a/github.tf +++ b/github.tf @@ -14,6 +14,7 @@ provider "github" { // add all member to github org resource "github_membership" "member" { for_each = toset(concat( + local.ictsc2025_members, local.ictsc2024_members, local.ictsc2023_members, local.ictsc2022_members, @@ -36,6 +37,7 @@ resource "github_membership" "member" { resource "github_team" "team" { for_each = toset([ "Admins", + "ictsc2025", "ictsc2024", "ictsc2023", "ictsc2022", @@ -59,6 +61,7 @@ resource "github_team" "team" { resource "github_team_members" "team_member" { for_each = { "Admins" = local.admin_members, + "ictsc2025" = local.ictsc2025_members, "ictsc2024" = local.ictsc2024_members, "ictsc2023" = local.ictsc2023_members, "ictsc2022" = local.ictsc2022_members, diff --git a/team-admin.tf b/team-admin.tf index 066e5d1..b2b7efb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -14,9 +14,14 @@ locals { "onokatio", "Explosive6363", "x86taka", - "Nishinoyama", + "nishinoyama", "Crow314", "logica0419", "mu-ruU1", + "tosuke", + "Dodai-Dodai", + "private-yusuke", + "Art-Atlas", + "Fuuma0000", ] } diff --git a/team-ictsc2022.tf b/team-ictsc2022.tf index f76787e..e2ba654 100644 --- a/team-ictsc2022.tf +++ b/team-ictsc2022.tf @@ -8,7 +8,7 @@ locals { "K-shir0", "Explosive6363", "chaya2z", - "Nishinoyama", + "nishinoyama", "Crow314", "syuuya-nakatomi", "logica0419", diff --git a/team-ictsc2023.tf b/team-ictsc2023.tf index 85c6074..971c1f3 100644 --- a/team-ictsc2023.tf +++ b/team-ictsc2023.tf @@ -2,7 +2,7 @@ locals { ictsc2023_members = [ "onokatio", "x86taka", - "Nishinoyama", + "nishinoyama", "Crow314", "syuuya-nakatomi", "logica0419", diff --git a/team-ictsc2024.tf b/team-ictsc2024.tf index bdb24c2..086c2b3 100644 --- a/team-ictsc2024.tf +++ b/team-ictsc2024.tf @@ -2,7 +2,7 @@ locals { ictsc2024_members = [ "onokatio", "x86taka", - "Nishinoyama", + "nishinoyama", "Crow314", "syuuya-nakatomi", "logica0419", diff --git a/team-ictsc2025.tf b/team-ictsc2025.tf new file mode 100644 index 0000000..101e118 --- /dev/null +++ b/team-ictsc2025.tf @@ -0,0 +1,26 @@ +locals { + ictsc2025_members = [ + "red-3ya", + "bqc0n", + "SouJimmy", + "ishisora", + "private-yusuke", + "39Hane", + "oshamashama", + "210on", + "takonomura", + "Crow314", + "hitto-hub", + "Art-Atlas", + "syuuya-nakatomi", + "logica0419", + "nishinoyama", + "nagayon-935", + "tosuke", + "k-84mo10", + "Fuuma0000", + "rk76feWF", + "toma1128", + "Dodai-Dodai", + ] +}