Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into logging
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard committed Apr 17, 2024
2 parents 675cb0a + 28b51fb commit 331f127
Show file tree
Hide file tree
Showing 25 changed files with 280 additions and 244 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
1 change: 0 additions & 1 deletion .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 Down
19 changes: 9 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip"
directory: "/docs/"
- package-ecosystem: pip
directory: /docs/
schedule:
interval: "weekly"
interval: weekly
allow:
# Allow only production updates for Sphinx
- dependency-name: "sphinx"
dependency-type: "production"
- dependency-name: sphinx
dependency-type: production
- package-ecosystem: github-actions
directory: /.github/workflows
schedule:
interval: weekly
42 changes: 6 additions & 36 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,9 @@
# Builds
- name: build::review
description: trigger a build for this PR
color: "7B4052"
- name: build::review
description: trigger a build for this PR
color: '#7b4052'

# Tags
- name: tag::noarch
description: related to noarch builds
color: "86C579"
aliases: []

# Deprecated
- name: 3_In_Progress
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: 4_Needs_Review
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: effort-high
description: "[deprecated]"
color: "888888"
- name: effort-low
description: "[deprecated] use good-first-issue"
color: "888888"
- name: effort-medium
description: "[deprecated]"
color: "888888"
- name: in_progress
description: "[deprecated] use milestones/project boards"
color: "888888"
- name: knowledge-high
description: "[deprecated]"
color: "888888"
- name: knowledge-low
description: "[deprecated] use good-first-issue"
color: "888888"
- name: knowledge-medium
description: "[deprecated]"
color: "888888"
- name: tag::noarch
description: related to noarch builds
color: '#86c579'
6 changes: 3 additions & 3 deletions .github/workflows/builds-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ${{ matrix.runner }}
steps:
- name: Remove build label
uses: actions/github-script@v6
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
with:
github-token: ${{ secrets.CANARY_ACTION_TOKEN }}
script: |
Expand All @@ -46,14 +46,14 @@ jobs:
# Clean checkout of specific git ref needed for package metadata version
# which needs env vars GIT_DESCRIBE_TAG and GIT_BUILD_STR:
- uses: actions/checkout@v3
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
ref: ${{ github.ref }}
clean: true
fetch-depth: 0

- name: Create and upload review build
uses: conda/actions/canary-release@v23.7.0
uses: conda/actions/canary-release@f46142e89fa703cc69f0421ca1d313ab2d5bfff6
with:
package-name: ${{ github.event.repository.name }}
subdir: ${{ matrix.subdir }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: CLA

on:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@ on:
branches:
- main
paths:
- '.github/workflows/docs.yml'
- 'docs/**'
- .github/workflows/docs.yml
- docs/**

# NOTE: github.event context is pull_request payload:
# https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#pull_request
pull_request:
paths:
- '.github/workflows/docs.yml'
- 'docs/**'
- .github/workflows/docs.yml
- docs/**

jobs:
docs:
if: '!github.event.repository.fork'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
with:
fetch-depth: 0
- name: Setup
run : |
run: |
make env-docs
- name: Build the docs
run : |
run: |
cd docs
conda run --name conda-build-docs make html
1 change: 0 additions & 1 deletion .github/workflows/issues.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Automate Issues

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Sync Labels

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lock.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Lock

on:
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@2e5cc851ca7162e9eb510e6da6a5c64022e606a7
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458
with:
# issues are added to the Planning project
# PRs are added to the Review project
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Stale

on:
Expand Down
Loading

0 comments on commit 331f127

Please sign in to comment.