Merge branch 'master' into patch-1

Author: galargh

.github/workflows/apply.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
       - name: Initialize terraform
         run: terraform init
       - name: Terraform Plan Download

.github/workflows/clean.yml

@@ -73,7 +73,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init -upgrade

.github/workflows/fix.yml

@@ -96,7 +96,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform

.github/workflows/plan.yml

@@ -82,7 +82,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
       - name: Initialize terraform
         run: terraform init
         working-directory: terraform
@@ -121,7 +121,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init

.github/workflows/sync.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Setup terraform
         uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
         with:
-          terraform_version: 1.3.7
+          terraform_version: 1.2.9
           terraform_wrapper: false
       - name: Initialize terraform
         run: terraform init -upgrade

.sync

@@ -1 +1 @@
-4232039370
+4234662432

github/ipfs.yml

@@ -451,6 +451,7 @@ repositories:
         - hacdias
         - lidel
       push:
+        - aarshkshah1992
         - gmasgras
         - web3-bot
         - willscott
@@ -853,6 +854,20 @@ repositories:
         - Merge - Go
         - Repos - Go
     visibility: public
+  gateway-conformance:
+    archived: false
+    collaborators:
+      admin:
+        - darobin
+        - lidel
+    default_branch: main
+    files:
+      .github/workflows/stale.yml:
+        content: .github/workflows/stale.yml
+    teams:
+      admin:
+        - ipdx
+    visibility: public
   gh-issue-form-test:
     archived: false
     default_branch: master
@@ -1805,12 +1820,12 @@ repositories:
           restrict_dismissals: false
         required_status_checks:
           contexts:
-            - macos (go 1.18.x)
             - macos (go 1.19.x)
-            - ubuntu (go 1.18.x)
+            - macos (go 1.20.x)
             - ubuntu (go 1.19.x)
-            - windows (go 1.18.x)
+            - ubuntu (go 1.20.x)
             - windows (go 1.19.x)
+            - windows (go 1.20.x)
           strict: true
     collaborators:
       admin:
@@ -2743,6 +2758,8 @@ repositories:
         required_status_checks:
           strict: true
     collaborators:
+      admin:
+        - Jorropo
       push:
         - web3-bot
     default_branch: main
@@ -2792,6 +2809,7 @@ repositories:
         - ipdx
         - w3dt-stewards
       maintain:
+        - kubo maintainers
         - Merge - Go
         - Repos - Go
     visibility: public
@@ -3715,6 +3733,19 @@ repositories:
     visibility: public
   ipfs-gui:
     archived: false
+    branch_protection:
+      main:
+        allows_deletions: false
+        allows_force_pushes: false
+        enforce_admins: false
+        require_conversation_resolution: false
+        require_signed_commits: false
+        required_linear_history: false
+        required_pull_request_reviews:
+          dismiss_stale_reviews: false
+          require_code_owner_reviews: false
+          required_approving_review_count: 1
+          restrict_dismissals: false
     collaborators:
       push:
         - ipfs-gui-bot
@@ -5625,6 +5656,7 @@ teams:
         - SgtPooki
       member:
         - hacdias
+        - whizzzkid
     parent_team_id: WG GUI/UX
     privacy: closed
   ipdx:
@@ -6127,6 +6159,7 @@ teams:
         - Stebalien
       member:
         - achingbrain
+        - yiannisbot
     privacy: closed
   TestGround:
     members:
@@ -6204,6 +6237,7 @@ teams:
         - ericronne
         - hacdias
         - SgtPooki
+        - whizzzkid
     privacy: closed
   WG Infrastructure:
     description: IPFS Infrastructure WG - Maintaining IPFS Infrastructure since 2014!

terraform/.terraform.lock.hcl

@@ -6,5 +6,6 @@ terraform {
     }
   }
 
-  required_version = "~> 1.3.7"
+  # https://github.com/hashicorp/terraform/issues/32329
+  required_version = "~> 1.2.9"
 }