Skip to content

Commit 3685b94

Browse files
committed
Run license check in container
1 parent 2d7573d commit 3685b94

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
needs-python: ${{ true }}
3030
needs-node: ${{ false }}
3131
- name: Licenses
32-
command: make licenses BINDIR="$(dirname $(which python))"
32+
command: bin/licenses
3333
needs-python: ${{ true }}
3434
needs-node: ${{ false }}
3535
- name: Translations

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ docs: .state/docker-build
8989
bin/docs
9090

9191
licenses:
92-
bin/licenses
92+
docker-compose run --rm web env -i ENCODING="C.UTF-8" \
93+
PATH="/opt/warehouse/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
94+
bin/licenses
9395

9496
deps: .state/docker-build
9597
docker-compose run --rm web env -i ENCODING="C.UTF-8" \

bin/licenses

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ for fn in $(find . -type f \( \
1010
! -name "*.min.js" \
1111
-name "*.js" \) \
1212
! -path "./.state*" \
13-
! -path "./node_modules*" \
13+
! -path "./docs*" \
1414
! -path "./htmlcov*" \
15+
! -path "./node_modules*" \
16+
! -path "./warehouse/admin/static/dist*" \
17+
! -path "./warehouse/static/dist*" \
1518
! -path "./warehouse/static/html*" \
1619
! -path "./warehouse/static/js/vendor*"); do
1720
# Check for license in first 5 lines (allows for shebang, encoding and handles comment character in various languages)

0 commit comments

Comments
 (0)