Skip to content

Commit

Permalink
Merge branch 'main' of github.com:conda/menuinst into add-NSSupportsA…
Browse files Browse the repository at this point in the history
…utomaticGraphicsSwitching
  • Loading branch information
marcoesters committed Apr 25, 2024
2 parents 4ddbabe + cbc0c80 commit 47b547d
Show file tree
Hide file tree
Showing 12 changed files with 86 additions and 37 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/0_bug.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Bug Report
description: Create a bug report.
labels:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/1_feature.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Feature Request
description: Create a feature request.
labels:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/2_documentation.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Documentation
description: Create a documentation related issue.
labels:
Expand Down
78 changes: 68 additions & 10 deletions .github/ISSUE_TEMPLATE/epic.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Epic
description: A collection of related tickets.
labels:
Expand All @@ -25,23 +24,82 @@ body:
options:
- label: I added a descriptive title
required: true
- label: I searched open reports and couldn't find a duplicate
- label: I searched open issues and couldn't find a duplicate
required: true

- type: textarea
id: summary
id: what
attributes:
label: Summary
label: What?
description: >-
Define the highlevel objectives to be accomplished in this epic. Include the
bigger picture of what is changing and/or the user story for why the
changes are desired/necessary.
What feature or problem will be addressed in this epic?
placeholder: Please describe here.
validations:
required: true

- type: textarea
id: why
attributes:
label: Linked Issues & PRs
description: List all issues related to this epic.
label: Why?
description: >-
Why is the reported issue(s) a problem, or why is the proposed feature needed?
(Research and spike issues can be linked here.)
value: |
- [ ] #
- [ ] <supporting issue from user, research, or spike>
placeholder: Please describe here and/or link to relevant supporting issues.
validations:
required: true

- type: textarea
id: user_impact
attributes:
label: User impact
description: >-
In what specific way(s) will users benefit from this change? (e.g. use cases or performance improvements)
placeholder: Please describe here.
validations:
required: true

- type: textarea
id: goals
attributes:
label: Goals
description: >-
What goal(s) should this epic accomplish?
value: |
- [ ] <goal>
validations:
required: true

- type: textarea
id: tasks
attributes:
label: Tasks
description: >-
What needs to be done to implement this change?
value: |
- [ ] <task or PR>
validations:
required: false

- type: textarea
id: blocked_by
attributes:
label: 'This epic is blocked by:'
description: >-
Epics and issues that block this epic.
value: |
- [ ] <dependency epic or issue>
validations:
required: false

- type: textarea
id: blocks
attributes:
label: 'This epic blocks:'
description: >-
Epics and issues that are blocked by this epic.
value: |
- [ ] <dependency epic or issue>
validations:
required: false
3 changes: 1 addition & 2 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: CLA

on:
Expand All @@ -19,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check CLA
uses: conda/actions/check-cla@v23.10.0
uses: conda/actions/check-cla@f46142e89fa703cc69f0421ca1d313ab2d5bfff6
with:
# [required]
# A token with ability to comment, label, and modify the commit status
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/issues.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Automate Issues

on:
Expand All @@ -24,12 +23,12 @@ jobs:
runs-on: ubuntu-latest
steps:
# remove [pending::feedback]
- uses: actions-ecosystem/action-remove-labels@v1.3.0
- uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0
with:
labels: ${{ env.FEEDBACK_LBL }}
github_token: ${{ secrets.PROJECT_TOKEN }}
# add [pending::support], if still open
- uses: actions-ecosystem/action-add-labels@v1.1.3
- uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
if: github.event.issue.state == 'open'
with:
labels: ${{ env.SUPPORT_LBL }}
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Sync Labels

on:
Expand All @@ -20,20 +19,20 @@ jobs:
GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
LOCAL: .github/labels.yml
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f
- id: has_local
uses: andstor/file-existence-action@v2.0.0
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6
with:
files: ${{ env.LOCAL }}
- name: Global Only
uses: EndBug/label-sync@v2.3.2
uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a
if: steps.has_local.outputs.files_exists == 'false'
with:
config-file: ${{ env.GLOBAL }}
delete-other-labels: true
dry-run: ${{ github.event.inputs.dryrun }}
- name: Global & Local
uses: EndBug/label-sync@v2.3.2
uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a
if: steps.has_local.outputs.files_exists == 'true'
with:
config-file: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Lock

on:
Expand All @@ -18,7 +17,7 @@ jobs:
if: '!github.event.repository.fork'
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v5
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
with:
# Number of days of inactivity before a closed issue is locked
issue-inactive-days: 365
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Add to Project

on:
Expand All @@ -14,7 +13,7 @@ jobs:
if: '!github.event.repository.fork'
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@v0.5.0
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458
with:
# issues are added to the Planning project
# PRs are added to the Review project
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Stale

on:
Expand Down Expand Up @@ -34,12 +33,12 @@ jobs:
days-before-issue-stale: 90
days-before-issue-close: 21
steps:
- uses: conda/actions/read-yaml@v23.10.0
- uses: conda/actions/read-yaml@f46142e89fa703cc69f0421ca1d313ab2d5bfff6
id: read_yaml
with:
path: https://raw.githubusercontent.com/conda/infra/main/.github/messages.yml

- uses: actions/stale@v9
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
id: stale
with:
# Only issues with these labels are checked whether they are stale
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ concurrency:
jobs:
run_test_suite:
name: ${{ matrix.os }}-py${{ matrix.python-version }}
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 60
env:
CONDA_NUMBER_CHANNEL_NOTICES: 0
PYTHONUNBUFFERED: 1
strategy:
fail-fast: false
matrix:
os: [windows, ubuntu, macos]
os: [windows-latest, ubuntu-latest, macos-13]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
exclude:
- os: macos
- os: macos-13
python-version: "3.11"
- os: macos
- os: macos-13
python-version: "3.10"
- os: macos
- os: macos-13
python-version: "3.9"

steps:
Expand All @@ -48,7 +48,7 @@ jobs:
fetch-depth: 0

- name: Add Linux dependencies
if: matrix.os == 'ubuntu'
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get install libfile-mimeinfo-perl desktop-file-utils
echo "XDG_UTILS_DEBUG_LEVEL=2" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion HOW_WE_USE_GITHUB.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ This is a duplicate of <b>[link to primary issue]</b>; please feel free to conti
<pre>

Please uninstall your current version of `conda` and reinstall the latest version.
Feel free to use either the [miniconda](https://docs.conda.io/en/latest/miniconda.html)
Feel free to use either the [miniconda](https://docs.anaconda.com/free/miniconda/)
or [anaconda](https://www.anaconda.com/products/individual) installer,
whichever is more appropriate for your needs.
</pre>
Expand Down

0 comments on commit 47b547d

Please sign in to comment.