From cbcc6119c1e6ccc9ce2fba63a9ead3ca97096aa9 Mon Sep 17 00:00:00 2001 From: crow Date: Sat, 8 Mar 2025 06:24:07 +0000 Subject: [PATCH 01/10] Update upload-artifact; v3 -> v4 --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2dab3a8c7af4bcf1d1220909e8aa0967fff8611e Mon Sep 17 00:00:00 2001 From: crow Date: Sat, 8 Mar 2025 06:41:32 +0000 Subject: [PATCH 02/10] Sync team members Rename `Nishinoyama` -> `nishinoyama` Add `tosuke` to admin --- team-admin.tf | 3 ++- team-ictsc2022.tf | 2 +- team-ictsc2023.tf | 2 +- team-ictsc2024.tf | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/team-admin.tf b/team-admin.tf index 066e5d1..1f4a7bb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -14,9 +14,10 @@ locals { "onokatio", "Explosive6363", "x86taka", - "Nishinoyama", + "nishinoyama", "Crow314", "logica0419", "mu-ruU1", + "tosuke", ] } 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", From 7eb07c8c33df61a59ea88ec42817a6e2856fb67c Mon Sep 17 00:00:00 2001 From: ToyamaYuki Date: Tue, 13 May 2025 10:33:29 +0900 Subject: [PATCH 03/10] add member2025 --- github.tf | 3 +++ team-admin.tf | 4 ++++ team-ictsc2025.tf | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 team-ictsc2025.tf 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 1f4a7bb..03ca117 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -19,5 +19,9 @@ locals { "logica0419", "mu-ruU1", "tosuke", + "private-yusuke", + "Art-Atlas", + "Fuuma0000", + "Dodai-Dodai", ] } 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", + ] +} From 33e94bc1119678552883356b9787daf55ab58822 Mon Sep 17 00:00:00 2001 From: ToyamaYuki Date: Tue, 13 May 2025 12:49:14 +0900 Subject: [PATCH 04/10] remove member2025 --- github.tf | 3 --- team-admin.tf | 4 ---- team-ictsc2025.tf | 26 -------------------------- 3 files changed, 33 deletions(-) delete mode 100644 team-ictsc2025.tf diff --git a/github.tf b/github.tf index 71669c2..56de4f0 100644 --- a/github.tf +++ b/github.tf @@ -14,7 +14,6 @@ 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, @@ -37,7 +36,6 @@ resource "github_membership" "member" { resource "github_team" "team" { for_each = toset([ "Admins", - "ictsc2025", "ictsc2024", "ictsc2023", "ictsc2022", @@ -61,7 +59,6 @@ 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 03ca117..1f4a7bb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -19,9 +19,5 @@ locals { "logica0419", "mu-ruU1", "tosuke", - "private-yusuke", - "Art-Atlas", - "Fuuma0000", - "Dodai-Dodai", ] } diff --git a/team-ictsc2025.tf b/team-ictsc2025.tf deleted file mode 100644 index 101e118..0000000 --- a/team-ictsc2025.tf +++ /dev/null @@ -1,26 +0,0 @@ -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", - ] -} From d167e4cd1f47b86f7928ac2b10de175ee7d9ccbf Mon Sep 17 00:00:00 2001 From: ToyamaYuki Date: Tue, 13 May 2025 13:59:38 +0900 Subject: [PATCH 05/10] =?UTF-8?q?2025=E3=83=A1=E3=83=B3=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=81README=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- github.tf | 3 +++ team-admin.tf | 4 ++++ team-ictsc2025.tf | 26 ++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 team-ictsc2025.tf diff --git a/README.md b/README.md index bf4befa..70f38da 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ 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/228). +3. create 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 1f4a7bb..b2b7efb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -19,5 +19,9 @@ locals { "logica0419", "mu-ruU1", "tosuke", + "Dodai-Dodai", + "private-yusuke", + "Art-Atlas", + "Fuuma0000", ] } 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", + ] +} From 8b6cb95f1f50f7d1f3b2af605726e0d7dbf28a78 Mon Sep 17 00:00:00 2001 From: Art-Atlas <136884923+Art-Atlas@users.noreply.github.com> Date: Tue, 13 May 2025 14:32:29 +0900 Subject: [PATCH 06/10] =?UTF-8?q?Revert=20"2025=E3=83=A1=E3=83=B3=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=81README=E6=9B=B4?= =?UTF-8?q?=E6=96=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- github.tf | 3 --- team-admin.tf | 4 ---- team-ictsc2025.tf | 26 -------------------------- 4 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 team-ictsc2025.tf diff --git a/README.md b/README.md index 70f38da..bf4befa 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ Manage github membership by Terraform ### Sample flow -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/228). -3. create pull req. +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. diff --git a/github.tf b/github.tf index 71669c2..56de4f0 100644 --- a/github.tf +++ b/github.tf @@ -14,7 +14,6 @@ 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, @@ -37,7 +36,6 @@ resource "github_membership" "member" { resource "github_team" "team" { for_each = toset([ "Admins", - "ictsc2025", "ictsc2024", "ictsc2023", "ictsc2022", @@ -61,7 +59,6 @@ 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 b2b7efb..1f4a7bb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -19,9 +19,5 @@ locals { "logica0419", "mu-ruU1", "tosuke", - "Dodai-Dodai", - "private-yusuke", - "Art-Atlas", - "Fuuma0000", ] } diff --git a/team-ictsc2025.tf b/team-ictsc2025.tf deleted file mode 100644 index 101e118..0000000 --- a/team-ictsc2025.tf +++ /dev/null @@ -1,26 +0,0 @@ -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", - ] -} From ca9de0ec281d3d516e7f0ceaf9cdafb94b7bce34 Mon Sep 17 00:00:00 2001 From: ToyamaYuki Date: Tue, 13 May 2025 14:42:15 +0900 Subject: [PATCH 07/10] =?UTF-8?q?2025=E3=83=A1=E3=83=B3=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- github.tf | 3 +++ team-admin.tf | 4 ++++ team-ictsc2025.tf | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 team-ictsc2025.tf 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 1f4a7bb..b2b7efb 100644 --- a/team-admin.tf +++ b/team-admin.tf @@ -19,5 +19,9 @@ locals { "logica0419", "mu-ruU1", "tosuke", + "Dodai-Dodai", + "private-yusuke", + "Art-Atlas", + "Fuuma0000", ] } 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", + ] +} From a4d71470cc2bc88bce4beb02c607a2b5ea4da2eb Mon Sep 17 00:00:00 2001 From: ToyamaYuki Date: Tue, 13 May 2025 14:43:55 +0900 Subject: [PATCH 08/10] edit README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bf4befa..70f38da 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,6 @@ 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/228). +3. create pull req. From a0ea387ec8e71656b8682a00c6b384cc1b7f749e Mon Sep 17 00:00:00 2001 From: Art-Atlas <136884923+Art-Atlas@users.noreply.github.com> Date: Tue, 13 May 2025 14:53:56 +0900 Subject: [PATCH 09/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70f38da..986d25d 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,5 @@ Manage github membership by Terraform ### Sample flow 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/228). +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. From 0060c515e328277071b6bcd3bfdc2c3c0f987587 Mon Sep 17 00:00:00 2001 From: Art-Atlas <136884923+Art-Atlas@users.noreply.github.com> Date: Tue, 13 May 2025 15:19:44 +0900 Subject: [PATCH 10/10] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 986d25d..cf58119 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,7 @@ Manage github membership by Terraform 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. +3. create pull req to master. +4. marge pull req. +5. create pull req to production. +6. marge pull req.