Skip to content

Commit

Permalink
Merge pull request #58 from njzjz/rerender
Browse files Browse the repository at this point in the history
rerender
  • Loading branch information
njzjz committed Jul 14, 2023
2 parents 6077cc2 + 9431b06 commit 7025108
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ cxx_compiler:
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-cuda:10.2
- quay.io/condaforge/linux-anvil-cos7-x86_64
fftw:
- '3'
hdf5:
- 1.10.6
jpeg:
- '9'
libpng:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: automerge
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@master
uses: conda-forge/automerge-action@main
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/webservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- name: webservices
id: webservices
uses: conda-forge/webservices-dispatch-action@master
uses: conda-forge/webservices-dispatch-action@main
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }}
16 changes: 8 additions & 8 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source:
#sha256: 5380c1689a93d7922e3d65d9c186401d429878bb3cbe9a692580d3470d6a253f

build:
number: 0
number: 1
skip: True # [not linux]
skip: True # [ppc64le]

Expand Down

0 comments on commit 7025108

Please sign in to comment.