Skip to content

Commit

Permalink
Merge branch 'develop' into feature/sheets-copy-pasting
Browse files Browse the repository at this point in the history
  • Loading branch information
JerBouma authored Jan 23, 2023
2 parents 9b7bd13 + 851f9ca commit dd7fbb0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ env:
PIP_DEFAULT_TIMEOUT: 100

on:
pull_request:
types: [opened, synchronize, edited]
push:
branches:
- 'feature/*'
Expand All @@ -17,7 +19,7 @@ on:

# Cancel previous runs that are not yet completed.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
group: ${{ github.event_name }}-${{ github.repository }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
1 change: 0 additions & 1 deletion build/conda/conda-3-9-env-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ dependencies:
- pip
- poetry=1.1.13
- lightgbm=3.3.3
- charset-normalizer=2.1.1

0 comments on commit dd7fbb0

Please sign in to comment.