Merge branch 'main' into exit-render-early-on-skip

conda · Aug 22, 2024 · 3ddbb35 · 3ddbb35
2 parents 6f1c010 + 746a0f4
commit 3ddbb35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check CLA
-        uses: conda/actions/check-cla@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
+        uses: conda/actions/check-cla@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
         with:
           # [required]
           # A token with ability to comment, label, and modify the commit status

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
           # Number of days of inactivity before a closed issue is locked
-          issue-inactive-days: 365
+          issue-inactive-days: 180
           # Do not lock issues created before a given timestamp, value must follow ISO 8601
           exclude-issue-created-before: ''
           # Do not lock issues with these labels, value must be a comma separated list of labels or ''
@@ -29,7 +29,6 @@ jobs:
           add-issue-labels: locked
           # Reason for locking an issue, value must be one of resolved, off-topic, too heated, spam or ''
           issue-lock-reason: resolved
-
           # Number of days of inactivity before a closed pull request is locked
           pr-inactive-days: 365
           # Do not lock pull requests created before a given timestamp, value must follow ISO 8601

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -33,7 +33,7 @@ jobs:
             days-before-issue-stale: 90
             days-before-issue-close: 21
     steps:
-      - uses: conda/actions/read-yaml@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
+      - uses: conda/actions/read-yaml@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
         id: read_yaml
         with:
           path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -257,16 +257,16 @@ Except where otherwise noted, votes require a quorum and a simple majority to pa
 
 You can reach the entire CoC Committee by emailing [conduct@conda.org](mailto:conduct@conda.org).
 
-| Name | Contact | Employer / Funding | Steering Council Member | Current Term Ends |
-| ---- | ---- | ---- | ---- | --- |
-| [Eric Dill](https://github.com/ericdill) | | [Anaconda](https://anaconda.com/) | | 2024-07-01 |
-| [Filipe Pires Alvarenga Fernandes](https://github.com/ocefpaf) | ocefpaf&#64;gmail&#46;com | [IOOS/NOAA](https://ioos.noaa.gov/) | Yes | 2024-07-01 |
-| [Bianca Henderson](https://github.com/beeankha) |bhenderson&#64;anaconda&#46;com | [Anaconda](https://anaconda.com/) | | 2024-07-01 |
-| [Katherine Kinnaman](https://github.com/kathatherine) | kkinnaman.condacoc&#64;gmail&#46;com | [Anaconda](https://anadonda.com/) | | 2024-07-01 |
-| [Mahe Iram Khan](https://github.com/ForgottenProgramme) | | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
-| [Ken Odegard](https://github.com/kenodegard) | kodegard&#64;anaconda&#46;com | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
-| [Crystal Soja](https://github.com/csoja), Co-Chair | | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
-| [Jaime Rodríguez-Guerra](https://github.com/jaimergp) | | [Quansight](https://quansight.com/) | | 2025-07-01 |
+| Name | Employer / Funding | Steering Council Member | Current Term Ends |
+| ---- | ---- | ---- | --- |
+| [Eric Dill](https://github.com/ericdill) | [Anaconda](https://anaconda.com/) | | 2026-07-01 |
+| [Dasha Gurova](https://github.com/dashagurova) | [Anaconda](https://anaconda.com/) | | 2026-07-01 |
+| [Bianca Henderson](https://github.com/beeankha) | [Anaconda](https://anaconda.com/) | | 2026-07-01 |
+| [Katherine Kinnaman](https://github.com/kathatherine) | [Anaconda](https://anadonda.com/) | | 2026-07-01 |
+| [Mahe Iram Khan](https://github.com/ForgottenProgramme) | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
+| [Ken Odegard](https://github.com/kenodegard) | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
+| [Crystal Soja](https://github.com/csoja), Co-Chair | [Anaconda](https://anaconda.com/) | | 2025-07-01 |
+| [Jaime Rodríguez-Guerra](https://github.com/jaimergp), Co-Chair | [Quansight](https://quansight.com/) | yes | 2025-07-01 |
 
 # Terms and New Members