Skip to content

Commit

Permalink
Merge branch 'main' into repo-sync/infrastructure/default
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored May 1, 2024
2 parents c0f9599 + 45d3623 commit 4c3df0b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
5 changes: 4 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ updates:
directory: /
schedule:
interval: weekly
labels: []
- package-ecosystem: github-actions
directory: /.github/workflows
schedule:
interval: weekly
6 changes: 3 additions & 3 deletions .github/workflows/builds-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.runner }}
steps:
- name: Remove build label
uses: actions/github-script@v6
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
github-token: ${{ secrets.CANARY_ACTION_TOKEN }}
script: |
Expand All @@ -42,14 +42,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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@1e442e090ad28c9b0f85697105703a303320ffd1 # v24.4.0
with:
package-name: ${{ github.event.repository.name }}
subdir: ${{ matrix.subdir }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ jobs:
strategy:
fail-fast: false
matrix:
runner: [ubuntu-latest, macos-latest, windows-latest]
runner: [ubuntu-latest, macos-13, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Timestamp
run: echo "TIMESTAMP=$(date -u "+%Y%m")" >> $GITHUB_ENV
shell: bash

- name: Cache conda
uses: actions/cache@v3
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: ~/conda_pkgs_dir
key: ${{ runner.os }}-conda-content-trust-${{ env.TIMESTAMP }}

- name: Setup miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -70,7 +70,7 @@ jobs:
run: pytest --cov=conda_content_trust

- name: Upload coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
with:
flags: ${{ matrix.python-version }},${{ runner.os }}

Expand Down Expand Up @@ -99,14 +99,14 @@ jobs:
steps:
# 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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
ref: ${{ github.ref }}
clean: true
fetch-depth: 0

# Explicitly use Python 3.11 since each of the OSes has a different default Python
- uses: actions/setup-python@v4
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
with:
python-version: '3.11'

Expand All @@ -132,7 +132,7 @@ jobs:
Path(environ["GITHUB_ENV"]).write_text(f"ANACONDA_ORG_LABEL={label}")
- name: Create and upload canary build
uses: conda/actions/canary-release@v23.7.0
uses: conda/actions/canary-release@1e442e090ad28c9b0f85697105703a303320ffd1 # v24.4.0
env:
# Run conda-build in isolated activation to properly package conda
_CONDA_BUILD_ISOLATED_ACTIVATION: 1
Expand Down

0 comments on commit 4c3df0b

Please sign in to comment.