Skip to content

Commit

Permalink
Merge branch 'main' into init-conda-grayskull
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored Oct 15, 2024
2 parents be658d4 + a7bf324 commit d33e867
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .clabot
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@
"mariusvniekerk",
"martinkou",
"matta9001",
"matterhorn103",
"matthewwardrop",
"MatthieuDartiailh",
"mattip",
Expand Down Expand Up @@ -459,6 +460,7 @@
"nicolas-geniteau",
"NikhilRaverkar",
"niklasholm",
"nilskch",
"njalerikson",
"njzjz",
"noahp",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
!github.event.repository.fork
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
# repository: ${{ github.repository }}
path: upstream

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
repository: ${{ github.event.inputs.org }}/${{ github.event.inputs.repo }}
path: downstream
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
GLOBAL: https://raw.githubusercontent.com/conda/infra/main/.github/global.yml
LOCAL: .github/labels.yml
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- id: has_local
uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: '!github.event.repository.fork'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: BetaHuhn/repo-file-sync-action@8b92be3375cf1d1b0cd579af488a9255572e4619 # v1.21.1
with:
GH_PAT: ${{ secrets.SYNC_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
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
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
repository: ${{ env.REPOSITORY || github.repository }}
ref: ${{ env.REF || '' }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
# standard end of line/end of file cleanup
- id: mixed-line-ending
Expand All @@ -26,7 +26,7 @@ repos:
require_serial: true
args: [--sort-keys=contributors]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.7
rev: v0.6.9
hooks:
# lint & attempt to correct failures (e.g. pyupgrade)
- id: ruff
Expand All @@ -50,7 +50,7 @@ repos:
templates/issues/bug.yml
)
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.2
rev: 0.29.4
hooks:
# verify github syntaxes
- id: check-github-workflows
Expand Down
1 change: 0 additions & 1 deletion sync/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ group:
dest: RELEASE.md
# Code of Conduct sync
- repos: |
conda/conda-lock
files:
- source: sync/CODE_OF_CONDUCT.md
dest: CODE_OF_CONDUCT.md

0 comments on commit d33e867

Please sign in to comment.