diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml index fd339b5..624bb18 100644 --- a/.github/workflows/apply.yml +++ b/.github/workflows/apply.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - run: pnpm install --frozen-lockfile && pnpm run build working-directory: scripts - name: Find sha for plan diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index 726812e..87f35ca 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -46,7 +46,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - name: Initialize scripts run: pnpm install --frozen-lockfile && pnpm run build working-directory: scripts diff --git a/.github/workflows/fix.yml b/.github/workflows/fix.yml index 309923b..30cf4c5 100644 --- a/.github/workflows/fix.yml +++ b/.github/workflows/fix.yml @@ -108,7 +108,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - name: Initialize scripts run: pnpm install --frozen-lockfile && pnpm run build working-directory: scripts diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index ed13376..130d3cb 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -44,7 +44,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - name: Initialize scripts run: pnpm install --frozen-lockfile && pnpm run build working-directory: scripts diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 6d683b9..0cc681a 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -89,7 +89,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - name: Sync run: | pnpm install --frozen-lockfile diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 1539b66..e621491 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: lts/* - cache: false + cache: '' - run: pnpm install --frozen-lockfile && pnpm run build working-directory: scripts - name: Update PRs diff --git a/.sync b/.sync index 31ef80c..9cb9d2a 100644 --- a/.sync +++ b/.sync @@ -1 +1 @@ -19604246461 +19713400638 diff --git a/github/multiformats.yml b/github/multiformats.yml index 4a3f13d..3d91c2c 100644 --- a/github/multiformats.yml +++ b/github/multiformats.yml @@ -151,6 +151,7 @@ repositories: - github-mgmt stewards - JavaScript Team visibility: public + web_commit_signoff_required: false c-multihash: archived: true c-multihashing: @@ -192,6 +193,7 @@ repositories: - dag-pb - ipfs visibility: public + web_commit_signoff_required: false cid: advanced_security: false allow_update_branch: false @@ -224,6 +226,7 @@ repositories: - ipld - multiformats visibility: public + web_commit_signoff_required: false clj-multihash: archived: true clj-multistream: @@ -265,6 +268,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false ex_multihash: archived: true github-mgmt: @@ -278,6 +282,8 @@ repositories: allows_force_pushes: false blocks_creations: false enforce_admins: false + force_push_bypassers: + - /galargh lock_branch: false require_conversation_resolution: false require_signed_commits: false @@ -285,6 +291,7 @@ repositories: required_pull_request_reviews: dismiss_stale_reviews: false require_code_owner_reviews: false + require_last_push_approval: false required_approving_review_count: 1 restrict_dismissals: false required_status_checks: @@ -320,6 +327,7 @@ repositories: topics: - ipdx visibility: public + web_commit_signoff_required: false go-base32: advanced_security: false allow_update_branch: false @@ -346,6 +354,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-base36: advanced_security: false allow_update_branch: false @@ -372,6 +381,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multiaddr-dns: advanced_security: false allow_update_branch: false @@ -405,6 +415,7 @@ repositories: - multiaddr - resolve visibility: public + web_commit_signoff_required: false go-multiaddr-fmt: advanced_security: false allow_update_branch: false @@ -431,6 +442,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multiaddr-net: archived: true go-multiaddr: @@ -450,6 +462,7 @@ repositories: required_pull_request_reviews: dismiss_stale_reviews: false require_code_owner_reviews: false + require_last_push_approval: false required_approving_review_count: 1 restrict_dismissals: false collaborators: @@ -475,6 +488,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multibase: advanced_security: false allow_update_branch: false @@ -502,6 +516,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multicodec-packed: archived: true go-multicodec: @@ -521,6 +536,7 @@ repositories: required_pull_request_reviews: dismiss_stale_reviews: false require_code_owner_reviews: false + require_last_push_approval: false required_approving_review_count: 1 restrict_dismissals: false collaborators: @@ -547,6 +563,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false go-multigram: advanced_security: false allow_update_branch: false @@ -574,6 +591,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multihash: advanced_security: false allow_update_branch: false @@ -601,6 +619,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-multistream: advanced_security: false allow_update_branch: false @@ -629,6 +648,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false go-varint: advanced_security: false allow_update_branch: false @@ -656,6 +676,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false haskell-multibase: archived: true haskell-multicodec: @@ -695,6 +716,7 @@ repositories: push: - Java Team visibility: public + web_commit_signoff_required: false java-multibase: advanced_security: false allow_update_branch: false @@ -727,6 +749,7 @@ repositories: push: - Java Team visibility: public + web_commit_signoff_required: false java-multihash: advanced_security: false allow_update_branch: false @@ -759,6 +782,7 @@ repositories: push: - Java Team visibility: public + web_commit_signoff_required: false js-blake2: advanced_security: false allow_update_branch: false @@ -799,6 +823,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false js-cid-tool: advanced_security: false allow_update_branch: false @@ -828,6 +853,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-cid: archived: true js-dns: @@ -859,6 +885,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-mafmt: advanced_security: false allow_update_branch: false @@ -886,6 +913,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-multiaddr-matcher: advanced_security: false allow_update_branch: true @@ -915,6 +943,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-multiaddr-to-uri: advanced_security: false allow_update_branch: true @@ -943,6 +972,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-multiaddr: advanced_security: false allow_update_branch: true @@ -970,6 +1000,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-multibase: archived: true js-multicodec-table: @@ -992,6 +1023,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false js-multicodec: archived: true js-multiformats: @@ -1041,6 +1073,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false js-multihash: archived: true js-multihashing-async: @@ -1075,6 +1108,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false js-sha3: advanced_security: false allow_update_branch: false @@ -1114,6 +1148,7 @@ repositories: - github-mgmt stewards - JavaScript Team visibility: public + web_commit_signoff_required: false js-uri-to-multiaddr: advanced_security: false allow_update_branch: false @@ -1142,6 +1177,7 @@ repositories: push: - JavaScript Team visibility: public + web_commit_signoff_required: false ma-pipe: advanced_security: false allow_update_branch: false @@ -1169,6 +1205,7 @@ repositories: push: - Go Team visibility: public + web_commit_signoff_required: false multiaddr: advanced_security: false allow_update_branch: true @@ -1201,6 +1238,7 @@ repositories: - ipfs-tech - JavaScript Team visibility: public + web_commit_signoff_required: false multibase: advanced_security: false allow_update_branch: false @@ -1230,6 +1268,7 @@ repositories: - ipfs-tech - JavaScript Team visibility: public + web_commit_signoff_required: false multicodec: advanced_security: false allow_update_branch: true @@ -1247,6 +1286,7 @@ repositories: required_pull_request_reviews: dismiss_stale_reviews: false require_code_owner_reviews: true + require_last_push_approval: false required_approving_review_count: 1 restrict_dismissals: false required_status_checks: @@ -1282,6 +1322,7 @@ repositories: - ipfs-tech - JavaScript Team visibility: public + web_commit_signoff_required: false multiformats: advanced_security: false allow_update_branch: false @@ -1312,6 +1353,7 @@ repositories: - ipfs-tech - JavaScript Team visibility: public + web_commit_signoff_required: false multigram: archived: true MultiHash.Net: @@ -1350,6 +1392,7 @@ repositories: - protocol - varint visibility: public + web_commit_signoff_required: false multistream-select: advanced_security: false allow_update_branch: false @@ -1378,6 +1421,7 @@ repositories: - Go Team - JavaScript Team visibility: public + web_commit_signoff_required: false multistream: advanced_security: false allow_update_branch: false @@ -1406,6 +1450,7 @@ repositories: - Go Team - JavaScript Team visibility: public + web_commit_signoff_required: false php-multihash: archived: true py-multiaddr: @@ -1442,6 +1487,7 @@ repositories: - network - python visibility: public + web_commit_signoff_required: false py-multibase: advanced_security: false allow_update_branch: false @@ -1457,8 +1503,8 @@ repositories: has_discussions: false merge_commit_message: PR_TITLE merge_commit_title: MERGE_MESSAGE - secret_scanning_push_protection: true - secret_scanning: true + secret_scanning_push_protection: false + secret_scanning: false squash_merge_commit_message: COMMIT_MESSAGES squash_merge_commit_title: COMMIT_OR_PR_TITLE teams: @@ -1472,6 +1518,7 @@ repositories: push: - Python Team visibility: public + web_commit_signoff_required: false py-multicodec: advanced_security: false allow_update_branch: false @@ -1487,8 +1534,8 @@ repositories: has_discussions: false merge_commit_message: PR_TITLE merge_commit_title: MERGE_MESSAGE - secret_scanning_push_protection: true - secret_scanning: true + secret_scanning_push_protection: false + secret_scanning: false squash_merge_commit_message: COMMIT_MESSAGES squash_merge_commit_title: COMMIT_OR_PR_TITLE teams: @@ -1502,6 +1549,7 @@ repositories: push: - Python Team visibility: public + web_commit_signoff_required: false py-multihash: advanced_security: false allow_update_branch: false @@ -1517,8 +1565,8 @@ repositories: has_discussions: false merge_commit_message: PR_TITLE merge_commit_title: MERGE_MESSAGE - secret_scanning_push_protection: true - secret_scanning: true + secret_scanning_push_protection: false + secret_scanning: false squash_merge_commit_message: COMMIT_MESSAGES squash_merge_commit_title: COMMIT_OR_PR_TITLE teams: @@ -1531,6 +1579,7 @@ repositories: push: - Python Team visibility: public + web_commit_signoff_required: false ruby-multihash: archived: true rust-cid: @@ -1585,6 +1634,7 @@ repositories: - rust-cid - rust visibility: public + web_commit_signoff_required: false rust-multiaddr: advanced_security: false allow_update_branch: false @@ -1602,6 +1652,7 @@ repositories: required_pull_request_reviews: dismiss_stale_reviews: false require_code_owner_reviews: false + require_last_push_approval: false required_approving_review_count: 1 restrict_dismissals: false required_status_checks: @@ -1648,6 +1699,7 @@ repositories: - Parity Tech - Rust Team visibility: public + web_commit_signoff_required: false rust-multibase: advanced_security: false allow_update_branch: false @@ -1700,6 +1752,7 @@ repositories: - multiformats - rust visibility: public + web_commit_signoff_required: false rust-multihash: advanced_security: false allow_update_branch: false @@ -1753,6 +1806,7 @@ repositories: - multiformats - rust visibility: public + web_commit_signoff_required: false scala-multihash: archived: true specs: @@ -1771,6 +1825,10 @@ repositories: require_conversation_resolution: false require_signed_commits: false required_linear_history: false + restrict_pushes: + - blocks_creations: false + push_allowances: + - multiformats/admin collaborators: push: - web3-bot @@ -1797,6 +1855,7 @@ repositories: push: - ipfs-tech visibility: public + web_commit_signoff_required: false SwiftMultiaddr: archived: true SwiftMultihash: @@ -1826,6 +1885,7 @@ repositories: pull: - github-mgmt stewards visibility: public + web_commit_signoff_required: false website: advanced_security: false allow_update_branch: false @@ -1857,8 +1917,10 @@ repositories: push: - ci visibility: public + web_commit_signoff_required: false teams: Admin: + create_default_maintainer: false description: Should have Admin access on every repo members: member: @@ -1875,6 +1937,7 @@ teams: - Stebalien privacy: closed Alumni: + create_default_maintainer: false members: member: - adlrocha @@ -1912,22 +1975,29 @@ teams: - wanderer privacy: closed Bots: + create_default_maintainer: false description: Admin access for bots in repos that need it privacy: closed C Sharp Team: + create_default_maintainer: false description: How shaaaarp can you seee 🎤 privacy: closed C Team: + create_default_maintainer: false description: This is a low level as it will get privacy: closed ci: + create_default_maintainer: false description: ci privacy: closed Clojure Team: + create_default_maintainer: false privacy: closed Contributors: + create_default_maintainer: false privacy: closed Elixir Team: + create_default_maintainer: false description: Magic Potions ⚗️ privacy: closed github-mgmt stewards: @@ -1939,6 +2009,7 @@ teams: # 3. Having a team instead of direct collaborators on the github-mgmt repository also enables easy reference in the github-mgmt CODEOWNERS file. # 4. Leaning on "github-mgmt stewards" for day-to-day admin over true org owners was done # as part of the effort to reduce org owners in https://github.com/ipfs/ipfs/issues/511 + create_default_maintainer: false description: Users that are effectively org admins members: # WARN: membership here should be treated as cautiously as having an "org owner" role, @@ -1967,6 +2038,7 @@ teams: - vmx privacy: closed Go Team: + create_default_maintainer: false description: Go multiformats people members: member: @@ -1987,24 +2059,31 @@ teams: - willscott privacy: closed Haskell Team: + create_default_maintainer: false description: And then I Haskell, what is your favourite 🍨 privacy: closed Infra: + create_default_maintainer: false description: https://github.com/protocol/infra-team/ privacy: closed ip-productivity: + create_default_maintainer: false members: maintainer: - galargh + parent_team_id: w3dt-stewards privacy: closed ipdx: + create_default_maintainer: false members: maintainer: - galargh member: - laurentsenta + parent_team_id: w3dt-stewards privacy: closed ipfs-gui: + create_default_maintainer: false description: IPFS GUI Team members: maintainer: @@ -2012,18 +2091,21 @@ teams: - SgtPooki privacy: closed ipfs-tech: + create_default_maintainer: false description: IPFS Foundation spec and registry maintenance crew members: maintainer: - darobin privacy: secret Java Team: + create_default_maintainer: false description: Java Java Java Java Java ☕️ members: member: - ianopolous privacy: closed JavaScript Team: + create_default_maintainer: false description: We asked ourselves, how can we make JavaScript more dynamic.. members: member: @@ -2047,14 +2129,17 @@ teams: - wemeetagain privacy: closed Parity Tech: + create_default_maintainer: false members: maintainer: - tomaka privacy: closed PHP Team: + create_default_maintainer: false description: "🐘 Personal Home Page " privacy: closed Python Team: + create_default_maintainer: false description: Enchanters of cobras 🐍 members: member: @@ -2065,9 +2150,11 @@ teams: - seetadev privacy: closed Ruby Team: + create_default_maintainer: false description: 🎶 Empenhei o meu anel de rubi.. P'ra te levar ao concerto que havia no Rivoli 🎶 privacy: closed Rust Team: + create_default_maintainer: false description: ⚙ The Iron Giant members: member: @@ -2085,11 +2172,14 @@ teams: - vmx privacy: closed Scala Team: + create_default_maintainer: false privacy: closed Swift Team: + create_default_maintainer: false description: 🦅 privacy: closed w3dt-stewards: + create_default_maintainer: false members: maintainer: - BigLep diff --git a/scripts/package.json b/scripts/package.json index 8625284..cdd2be6 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -21,6 +21,7 @@ "@actions/exec": "^1.1.1", "@actions/github": "^6.0.0", "@octokit/auth-app": "^7.2.0", + "@octokit/core": "^6.1.5", "@octokit/graphql": "^8.2.2", "@octokit/plugin-paginate-rest": "^13.1.1", "@octokit/plugin-retry": "^7.2.1", diff --git a/scripts/pnpm-lock.yaml b/scripts/pnpm-lock.yaml index 5ea576d..3104129 100644 --- a/scripts/pnpm-lock.yaml +++ b/scripts/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: '@octokit/auth-app': specifier: ^7.2.0 version: 7.2.0 + '@octokit/core': + specifier: ^6.1.5 + version: 6.1.5 '@octokit/graphql': specifier: ^8.2.2 version: 8.2.2 diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 027b487..7d1c42b 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/integrations/github" { - version = "5.25.0" - constraints = "5.25.0" + version = "6.6.0" + constraints = "~> 6.6.0" hashes = [ - "h1:PV5RT2TVZIoaw9gLRM9iVMz1kKOoVYRz5AEsJ8OaXDM=", - "zh:15e6e652b10f225b1d2a6c675e38e7e119b0a19a3009a88e5c6a478d65f02fc5", - "zh:1a875d13507eca65d64bdac0f62910f6ce26fb1ef746bbf5f7b2bbe86c78441b", - "zh:1f41a0053d13971d7c8fd2eb0b3ce263f65d7c2a393580f72ad83a28d562a45e", - "zh:274fa0c49b3ef20f968cefd01d5e40af76437868ff7accc8430c0407b9f9d4b6", - "zh:2b30f8de0f5e0f3157e368ae034fb62ee92798329afc5bf239d384e393ef6860", - "zh:53e0da4b92ed389c766042fc60e72629896a2f6050ed3b7c036cc8fde8a22858", - "zh:5a9e3900a0e7b62c7769e8c7e993e0f87229b0a0cc4fa3064fc79bfe73fa1ec9", - "zh:7fa4a46ec94f6e1da93399955e8571ba0b20100e1bd7e34b5e75fbed7d43ae72", - "zh:bc2f75e40c8743539199f09f0fc54ff091d1bb05398539642c3f75d869a251c5", - "zh:d80a7bdfc4be101559c0bec516a73239291d18be522a2fa872fa8e07a65a3966", - "zh:ea230531bb0fe2f778a72edb6bc6a80983a7a2c82a1c5f255a6ae11d45f714f2", - "zh:f649cd014748ef498ccb8c07c4de1d55b736daeaeb8591395cd6b80a8502612a", - "zh:fb94e009e8348bb016cde0b39b8e0968f60d5fd9cbc0be82bdb3ab498e5dea46", - "zh:fbc119a51967c497d24a728d5afad72fb5f49494ef3645816336f898ac031661", + "h1:Fp0RrNe+w167AQkVUWC1WRAsyjhhHN7aHWUky7VkKW8=", + "zh:0b1b5342db6a17de7c71386704e101be7d6761569e03fb3ff1f3d4c02c32d998", + "zh:2fb663467fff76852126b58315d9a1a457e3b04bec51f04bf1c0ddc9dfbb3517", + "zh:4183e557a1dfd413dae90ca4bac37dbbe499eae5e923567371f768053f977800", + "zh:48b2979f88fb55cdb14b7e4c37c44e0dfbc21b7a19686ce75e339efda773c5c2", + "zh:5d803fb06625e0bcf83abb590d4235c117fa7f4aa2168fa3d5f686c41bc529ec", + "zh:6f1dd094cbab36363583cda837d7ca470bef5f8abf9b19f23e9cd8b927153498", + "zh:772edb5890d72b32868f9fdc0a9a1d4f4701d8e7f8acb37a7ac530d053c776e3", + "zh:798f443dbba6610431dcef832047f6917fb5a4e184a3a776c44e6213fb429cc6", + "zh:cc08dfcc387e2603f6dbaff8c236c1254185450d6cadd6bad92879fe7e7dbce9", + "zh:d5e2c8d7f50f91d6847ddce27b10b721bdfce99c1bbab42a68fa271337d73d63", + "zh:e69a0045440c706f50f84a84ff8b1df520ec9bf757de4b8f9959f2ed20c3f440", + "zh:efc5358573a6403cbea3a08a2fcd2407258ac083d9134c641bdcb578966d8bdf", + "zh:f627a255e5809ec2375f79949c79417847fa56b9e9222ea7c45a463eb663f137", + "zh:f7c02f762e4cf1de7f58bde520798491ccdd54a5bd52278d579c146d1d07d4f0", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/terraform/locals.tf b/terraform/locals.tf index 8874a74..fbf0079 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -173,7 +173,7 @@ locals { "github_repository" = { for item in [ for repository, config in local.sources.config.github_repository.this : - try(config.archived, false) ? { + try(config.archived, false) && try(contains(keys(local.sources.state.github_repository.this), repository), false) ? { source = "state" index = repository archived = config.archived