diff --git a/.dockerignore b/.dockerignore index 13da2c8ab..f4e94a82f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,6 +8,7 @@ !resources/locale/compiled !util/docker/web !util/openapi.php +!vendor !web !templates !plugins diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 5cde619d9..0fea60b06 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -22,6 +22,28 @@ jobs: run: | git gc --prune=now --aggressive + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache Composer Downloads + uses: actions/cache@v1 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: Cache PHP dependencies + uses: actions/cache@v1 + with: + path: vendor + key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }} + + - name: Install Composer Dependencies + uses: php-actions/composer@master + - name: Build base Docker image. run: | docker pull azuracast/azuracast_web_v2:latest diff --git a/composer.json b/composer.json index 5eacb03f9..f42122f84 100644 --- a/composer.json +++ b/composer.json @@ -114,7 +114,6 @@ "codeception": "codecept run --no-interaction --coverage --coverage-xml --fail-fast", "codeception-no-coverage": "codecept run --no-interaction", "ci-import-locales": [ - "@composer install", "bin/console locale:import" ] },