Skip to content

Commit

Permalink
Merge branch 'main' into zstd
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy authored Aug 26, 2024
2 parents df2c850 + 3470236 commit 36de23a
Show file tree
Hide file tree
Showing 20 changed files with 545 additions and 181 deletions.
42 changes: 3 additions & 39 deletions .github/ISSUE_TEMPLATE/0_bug.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# edit this in https://github.com/conda/infrastructure

name: Bug Report
description: Create a bug report.
labels:
Expand All @@ -13,7 +15,7 @@ body:
Since there are already a lot of open issues, please also take a moment to search existing ones to see if your bug has already been reported. If you find something related, please upvote that issue and provide additional details as necessary.
💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
💐 Thank you for helping to make `conda/conda-pack` better. We would be unable to improve `conda/conda-pack` without our community!
- type: checkboxes
id: checks
attributes:
Expand All @@ -31,45 +33,7 @@ body:
description: What should have happened instead? Please provide as many details as possible. The more information provided, the more likely we are able to replicate your problem and offer a solution.
validations:
required: true
- type: textarea
id: info
attributes:
label: Conda Info
description: |
Let's collect some basic information about your conda install.
Please run the following command from your command line and paste the output below.
```bash
conda info
```
render: shell
- type: textarea
id: config
attributes:
label: Conda Config
description: |
Let's collect any customizations you may have for your conda install.
Please run the following command from your command line and paste the output below.
```bash
conda config --show-sources
```
render: shell
- type: textarea
id: list
attributes:
label: Conda list
description: |
The packages installed into your environment can offer clues as to the problem you are facing.
Please activate the environment within which you are encountering this bug, run the following command from your command line, and paste the output below.

```bash
conda list --show-channel-urls
```
render: shell
- type: textarea
id: context
attributes:
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/1_feature.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# edit this in https://github.com/conda/infrastructure

name: Feature Request
description: Create a feature request.
labels:
Expand All @@ -13,7 +15,7 @@ body:
Since there are already a lot of open issues, please also take a moment to search existing ones to see if your feature request has already been submitted. If you find something related, please upvote that issue and provide additional details as necessary.
💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
💐 Thank you for helping to make `conda/conda-pack` better. We would be unable to improve `conda/conda-pack` without our community!
- type: checkboxes
id: checks
attributes:
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/2_documentation.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# edit this in https://github.com/conda/infrastructure

name: Documentation
description: Create a documentation related issue.
labels:
Expand Down
5 changes: 4 additions & 1 deletion .github/ISSUE_TEMPLATE/epic.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# edit this in https://github.com/conda/infrastructure

name: Epic
description: A collection of related tickets.
labels:
Expand All @@ -15,7 +17,8 @@ body:
Since there are already a lot of open issues, please also take a moment to search existing ones to see if a similar epic has already been opened. If you find something related, please upvote that issue and provide additional details as necessary.
💐 Thank you for helping to make Conda better. We would be unable to improve Conda without our community!
💐 Thank you for helping to make `conda/conda-pack` better. We would be unable to improve `conda/conda-pack` without our community!
- type: checkboxes
id: checks
attributes:
Expand Down
17 changes: 2 additions & 15 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,7 @@
- any noteworthy (or hacky) choices to be aware of,
- or what the problem resolved here looked like. -->

### Checklist - did you ...

<!-- If any of the following items aren't relevant to your contribution,
please still tick them so we know you've gone through the checklist. -->

- [ ] Add a file to the `news` directory ([using the template](../blob/main/news/TEMPLATE)) for the next release's release notes?
<!-- All "significant" changes should get an entry:
- user-facing changes or enhancements
- bug fixes
- deprecations
- documentation updates
- other changes -->
- [ ] Add / update necessary tests?
- [ ] Add / update outdated documentation?

<!-- Just as a reminder, everyone in all conda org spaces (including PRs)
must follow the Conda Org Code of Conduct (link below).
Expand All @@ -31,5 +18,5 @@
let us know!
Helpful links:
- Conda Org COC: https://github.com/conda-incubator/governance/blob/main/CODE_OF_CONDUCT.md
- Contributing docs: ../blob/main/CONTRIBUTING.md -->
- Conda Org COC: https://github.com/conda/conda-pack/blob/main/CODE_OF_CONDUCT.md
- Contributing docs: https://github.com/conda/conda-pack/blob/main/CONTRIBUTING.md -->
50 changes: 50 additions & 0 deletions .github/template-files/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
conda/governance:
# [required] community files
- CODE_OF_CONDUCT.md

conda/infrastructure:
# [required] general workflows
- .github/workflows/cla.yml
- .github/workflows/update.yml

# [optional] to include repo in https://github.com/orgs/conda/projects/2
- .github/workflows/issues.yml
- .github/workflows/labels.yml
- .github/workflows/project.yml

# [optional] stale bot workflows
- .github/workflows/stale.yml
- .github/workflows/lock.yml

# [optional] general processes for the conda org
- src: templates/HOW_WE_USE_GITHUB.md
dst: HOW_WE_USE_GITHUB.md

# [optional] standard issue templates
- src: templates/issues/bug.yml
dst: .github/ISSUE_TEMPLATE/0_bug.yml

- src: templates/issues/feature.yml
dst: .github/ISSUE_TEMPLATE/1_feature.yml

- src: templates/issues/documentation.yml
dst: .github/ISSUE_TEMPLATE/2_documentation.yml

- src: templates/issues/epic.yml
dst: .github/ISSUE_TEMPLATE/epic.yml

# [optional] standard PR template
# - src: templates/pull_requests/news_tests_docs.md
# dst: .github/template-files/templates/pull_request_template_details.md
- src: templates/pull_requests/base.md
dst: .github/PULL_REQUEST_TEMPLATE.md

# [optional] rever release files
# - src: templates/releases/RELEASE.md
# dst: RELEASE.md
# with:
# placeholder: YY.M
# - src: templates/releases/rever.xsh
# dst: rever.xsh
# - src: templates/releases/TEMPLATE
# dst: news/TEMPLATE
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-12,ubuntu-latest,windows-latest]
pyver: ["3.7","3.8","3.9","3.10"]
pyver: ["3.8","3.9","3.10"]
include:
# include the appropriate dependencies for testing SquashFS on each OS
- os: macos-12
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
124 changes: 124 additions & 0 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
name: Update Repository

on:
# every Sunday at 00:36 UTC
# https://crontab.guru/#36_2_*_*_0
schedule:
- cron: 36 2 * * 0

workflow_dispatch:

issue_comment:
types:
- created

jobs:
update:
if: >-
!github.event.repository.fork
&& (
github.event_name == 'schedule'
|| github.event_name == 'workflow_dispatch'
|| (
github.event_name == 'issue_comment'
&& github.event.issue.pull_request
&& (
github.event.comment.body == '@conda-bot render'
|| github.event.comment.body == '@conda-bot recreate'
)
)
)
runs-on: ubuntu-latest
steps:
- if: github.event_name == 'issue_comment'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
with:
comment-id: ${{ github.event.comment.id }}
reactions: eyes
reactions-edit-mode: replace
token: ${{ secrets.SYNC_TOKEN }}

- if: github.event.comment.body == '@conda-bot render'
name: Configure git origin
run: |
echo REPOSITORY=$(curl --silent ${{ github.event.issue.pull_request.url }} | jq --raw-output '.head.repo.full_name') >> $GITHUB_ENV
echo REF=$(curl --silent ${{ github.event.issue.pull_request.url }} | jq --raw-output '.head.ref') >> $GITHUB_ENV
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
repository: ${{ env.REPOSITORY || github.repository }}
ref: ${{ env.REF || '' }}
token: ${{ secrets.SYNC_TOKEN }}

- name: Configure git user
run: |
git config --global user.name 'Conda Bot'
git config --global user.email '18747875+conda-bot@users.noreply.github.com'
- uses: conda/actions/combine-durations@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
id: durations
continue-on-error: true

- uses: conda/actions/template-files@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
id: templates
continue-on-error: true

- name: Commit changes
# no-op if there are no updates
continue-on-error: true
run: |
git add .
git commit --message "🤖 updated file(s)"
- if: github.event.comment.body != '@conda-bot render'
name: Create fork
# no-op if the repository is already forked
run: echo FORK=$(gh repo fork --clone=false --default-branch-only 2>&1 | awk '{print $1}') >> $GITHUB_ENV
env:
GH_TOKEN: ${{ secrets.SYNC_TOKEN }}

- if: github.event.comment.body != '@conda-bot render'
id: create
# no-op if no commits were made
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
with:
push-to-fork: ${{ env.FORK }}
token: ${{ secrets.SYNC_TOKEN }}
branch: update
delete-branch: true
title: 🤖 Update infrastructure file(s)
body: |
[update.yml]: ${{ github.server_url }}/${{ github.repository }}/blob/main/.github/workflows/update.yml
Your friendly repository updater.
${{ steps.durations.outputs.summary }}
${{ steps.templates.outputs.summary }}
This PR was triggered by @${{ github.triggering_actor }} via ${{ github.event_name }}.
<details>
<summary>Commands</summary>
Trigger actions by commenting on this PR:
- `@conda-bot render` will run rendering workflows and commit and push any changes to this PR
- `@conda-bot recreate` will recreate this PR, overwriting any edits that have been made to it
</details>
###### Auto-generated by the [`update.yml`][update.yml] workflow, see ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
- if: github.event.comment.body == '@conda-bot render'
id: update
name: Push changes
run: git push --force-with-lease

- if: always() && github.event_name == 'issue_comment'
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
with:
comment-id: ${{ github.event.comment.id }}
reactions: ${{ (steps.create.conclusion == 'success' || steps.update.conclusion == 'success') && 'hooray' || 'confused' }}
reactions-edit-mode: replace
token: ${{ secrets.SYNC_TOKEN }}
Loading

0 comments on commit 36de23a

Please sign in to comment.