Merge pull request #97 from multiformats/master-upgrade

upgrade@8022060774
multiformats · Feb 23, 2024 · d4cf920 · d4cf920
2 parents 8449efc + 990085c
commit d4cf920
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 32 deletions.
diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml
@@ -23,7 +23,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Discover workspaces
         id: workspaces
         run: echo "this=$(ls github | jq --raw-input '[.[0:-4]]' | jq -sc add)" >> $GITHUB_OUTPUT
@@ -65,7 +65,7 @@ jobs:
         working-directory: terraform
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:

diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
@@ -30,7 +30,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Discover workspaces
         id: workspaces
         env:
@@ -69,7 +69,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:

diff --git a/.github/workflows/fix.yml b/.github/workflows/fix.yml
@@ -36,7 +36,7 @@ jobs:
       skip-fix: ${{ steps.skip-fix.outputs.this }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: github.event_name == 'pull_request_target'
         env:
           NUMBER: ${{ github.event.pull_request.number }}
@@ -83,7 +83,7 @@ jobs:
       TF_VAR_write_delay_ms: 300
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: github.event_name == 'pull_request_target'
         env:
           NUMBER: ${{ github.event.pull_request.number }}
@@ -142,14 +142,14 @@ jobs:
           installation_id: ${{ secrets[format('RW_GITHUB_APP_INSTALLATION_ID_{0}', github.repository_owner)] || secrets.RW_GITHUB_APP_INSTALLATION_ID }}
           private_key: ${{ secrets.RW_GITHUB_APP_PEM_FILE }}
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           token: ${{ steps.token.outputs.token }}
           path: head
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: base
       - name: Download YAML configs

diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
@@ -27,7 +27,7 @@ jobs:
       TF_WORKSPACE: ${{ github.repository_owner }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Initialize scripts
         run: npm install && npm run build
         working-directory: scripts

diff --git a/.github/workflows/plan.yml b/.github/workflows/plan.yml
@@ -25,7 +25,7 @@ jobs:
       workspaces: ${{ steps.workspaces.outputs.this }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: github.event_name == 'pull_request_target'
         env:
           NUMBER: ${{ github.event.pull_request.number }}
@@ -70,7 +70,7 @@ jobs:
       TF_VAR_write_delay_ms: 300
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: github.event_name == 'pull_request_target'
         env:
           NUMBER: ${{ github.event.pull_request.number }}
@@ -112,7 +112,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.RO_AWS_SECRET_ACCESS_KEY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - if: github.event_name == 'pull_request_target'
         env:
           NUMBER: ${{ github.event.pull_request.number }}

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -24,7 +24,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Discover workspaces
         id: workspaces
         env:
@@ -63,7 +63,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
@@ -113,7 +113,7 @@ jobs:
           installation_id: ${{ secrets[format('RW_GITHUB_APP_INSTALLATION_ID_{0}', github.repository_owner)] || secrets.RW_GITHUB_APP_INSTALLATION_ID }}
           private_key: ${{ secrets.RW_GITHUB_APP_PEM_FILE }}
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ steps.token.outputs.token }}
       - uses: ./.github/actions/git-config-user

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -20,7 +20,7 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: npm ci && npm run build
         working-directory: scripts
       - name: Update PRs

diff --git a/scripts/src/actions/remove-inactive-members.ts b/scripts/src/actions/remove-inactive-members.ts
@@ -39,9 +39,6 @@ function getResources<T extends Resource>(
  *  a. do not have 'KEEP:' in their inline comment AND
  *  b. have not been added to the team recently (if passed through NEW_TEAM_MEMBERS) AND
  *  c. have not performed any activity on any repository the team they're a member of has access to in the past X months.
- * 6. It removes teams which:
- *  a. do not have 'KEEP:' in their inline comment AND
- *  b. do not have members anymore.
  */
 async function run(): Promise<void> {
   const newMembers = JSON.parse(process.env.NEW_MEMBERS || '[]')
@@ -189,19 +186,6 @@ async function run(): Promise<void> {
     }
   }
 
-  // remove teams that have no members
-  const teams = getResources(config, Team)
-  const teamMembersAfterRemoval = config.getResources(TeamMember)
-  for (const team of teams) {
-    const hasMembers = teamMembersAfterRemoval.some(
-      teamMember => teamMember.team === team.name
-    )
-    if (!hasMembers) {
-      console.log(`Removing ${team.name} team`)
-      config.removeResource(team)
-    }
-  }
-
   config.save()
 }