diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 432e1afd6d..6e0cf7d12e 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -6,6 +6,30 @@ env: PS_IMG_VERSION: prestashop/prestashop:1.7-7.4-apache jobs: + build-js: + name: Build JS app + runs-on: ubuntu-latest + defaults: + run: + working-directory: _dev + steps: + - name: Checkout + uses: actions/checkout@v2.0.0 + + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: npm + + - name: Build JS files + run: npm run build + + - name: Upload JS files + uses: actions/upload-artifact@v2 + with: + name: built-app-in-folder-views-js + path: ../views/js + build: name: Build dependencies & create artifact runs-on: ubuntu-latest @@ -13,12 +37,11 @@ jobs: - name: Checkout uses: actions/checkout@v2.0.0 - - name: Build JS dependencies - uses: PrestaShopCorp/github-action-build-js/12@v1.0 + - name: Download VueJS application + uses: actions/download-artifact@v2 with: - cmd: npm - path: ./_dev - + name: built-app-in-folder-views-js + path: views/js - name: Install dev composer dependencies run: composer install @@ -33,7 +56,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: ../ diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml index 7bf5eeafad..4d0abd30d5 100644 --- a/.github/workflows/js.yml +++ b/.github/workflows/js.yml @@ -4,12 +4,18 @@ jobs: js-linter: name: JS linter runs-on: ubuntu-latest + defaults: + run: + working-directory: _dev steps: - name: Checkout uses: actions/checkout@v2.0.0 + + - uses: actions/setup-node@v2 + with: + node-version: '14' + cache: npm - name: Lint JS files - uses: PrestaShopCorp/github-action-lint-js/12@v1.0 - with: - cmd: npm - path: ./_dev + run: npm run lint + diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3ff5b1580c..d01439f726 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,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 +36,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 +61,7 @@ jobs: needs: build steps: - name: Download artifact - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: ${{ github.event.repository.name }}