Skip to content

Commit

Permalink
Merge branch 'main' into jeadie/containers
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeadie authored Apr 12, 2023
2 parents 3e2c075 + ee68251 commit 6ecb77c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
name: Continuous integration

on:
push:
branches:
- main
paths-ignore:
- '**.md'
- 'CITATION.cff'
- 'LICENSE'
- '.gitignore'
- 'docs/**'
pull_request:
branches:
- main
paths-ignore:
- '**.md'
- 'CITATION.cff'
- 'LICENSE'
- '.gitignore'
- 'docs/**'
# on:
# push:
# branches:
# - main
# paths-ignore:
# - '**.md'
# - 'CITATION.cff'
# - 'LICENSE'
# - '.gitignore'
# - 'docs/**'
# pull_request:
# branches:
# - main
# paths-ignore:
# - '**.md'
# - 'CITATION.cff'
# - 'LICENSE'
# - '.gitignore'
# - 'docs/**'
workflow_dispatch:
inputs:
manual_revision_reference:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}-test
labels: ${{ steps.meta.outputs.labels }}
file: Dockerfile.test
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64
2 changes: 1 addition & 1 deletion .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- main
- main-remove-action
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 6ecb77c

Please sign in to comment.