diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c94124633a53c7a355a0fec980f1ea5a588454e..50db279402df200a2e88d67cd9ac1c1500cdc504 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,11 @@ env: DB_PORT: 5432 name: CI -on: [push, pull_request] +on: + push: + branches-ignore: "master" + pull_request: + branches: "*" jobs: test: diff --git a/Dockerfile b/Dockerfile index ad0a5e2e218835a3220d6baba9a9b27a02f4a38c..5f5b92808474f2da5a7daca41c963625589435df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV BUNDLE_APP_CONFIG="$RAILS_ROOT/.bundle" RUN mkdir -p $RAILS_ROOT WORKDIR $RAILS_ROOT -ARG BUILD_PACKAGES="build-base curl-dev git" +ARG BUILD_PACKAGES="build-base curl-dev git shared-mime-info" ARG DEV_PACKAGES="postgresql-dev sqlite-libs sqlite-dev yaml-dev zlib-dev nodejs yarn" ARG RUBY_PACKAGES="tzdata"