From 93a76116474f6f456573ac121791e4d4acc249a7 Mon Sep 17 00:00:00 2001 From: Thomas Nabord Date: Wed, 14 Jul 2021 12:14:10 +0200 Subject: [PATCH] Use actions/setup-node@v2 to cache node_modules --- .github/workflows/build-release.yml | 17 +++++++++++------ .github/workflows/js.yml | 24 ++++++++++++++++++------ .github/workflows/php.yml | 6 +++--- .github/workflows/publish.yml | 24 +++++++++++++++--------- 4 files changed, 47 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 432e1afd6d..f848d15704 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -11,14 +11,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - - name: Build JS dependencies - uses: PrestaShopCorp/github-action-build-js/12@v1.0 + - uses: actions/setup-node@v2 with: - cmd: npm - path: ./_dev - + node-version: '14' + cache: npm + cache-dependency-path: '_dev/package-lock.json' + + - name: Install & build + working-directory: _dev + run: | + npm install + npm run build - name: Install dev composer dependencies run: composer install diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 4cd0bcb607..52e5f2c42a 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -6,13 +6,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 + + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: npm + cache-dependency-path: '_dev/package-lock.json' - name: Lint JS files - uses: PrestaShopCorp/github-action-lint-js/12@v1.0 - with: - cmd: npm - path: ./_dev + working-directory: _dev + run: | + npm install + npm run lint unit-tests: name: JS Unit tests @@ -21,8 +27,14 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: npm + cache-dependency-path: '_dev/package-lock.json' + - name: Install & run + working-directory: _dev run: | - cd _dev npm install npm run test:unit diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 2958117f52..4f84d625cd 100755 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - name: PHP syntax checker 7.3 uses: prestashop/github-action-php-lint/7.3@master @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - name: Run PHP-CS-Fixer uses: prestashopcorp/github-action-php-cs-fixer@master @@ -32,7 +32,7 @@ jobs: presta-versions: ['1.7.7.0', 'latest'] steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - name: Cache vendor folder uses: actions/cache@v1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81e2333af9..d0fda595f8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,13 +10,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - - name: Build JS dependencies - uses: PrestaShopCorp/github-action-build-js/12@v1.0 + - uses: actions/setup-node@v2 with: - cmd: npm - path: ./_dev + node-version: '14' + cache: npm + cache-dependency-path: '_dev/package-lock.json' + + - name: Install & build + working-directory: _dev + run: | + npm install + npm run build - name: Install composer dependencies run: composer install --no-dev -o @@ -25,7 +31,7 @@ jobs: uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0 - name: Create & upload artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: ${{ github.event.repository.name }} path: ../ @@ -36,7 +42,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: ${{ github.event.repository.name }} @@ -61,7 +67,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: ${{ github.event.repository.name }} @@ -101,7 +107,7 @@ jobs: if: github.event.release.prerelease == false steps: - name: Checkout - uses: actions/checkout@v2.0.0 + uses: actions/checkout@v2 - name: Download release asset uses: dsaltares/fetch-gh-release-asset@0.0.5