diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 1abfa7cf..26c02ec7 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -3,6 +3,9 @@ # If changes are needed, update the action npm in # https://github.com/mobsuccess-devops/github-mobsuccess-policy on: + merge_group: + types: + - checks_requested push: branches: [master, preprod, prod] pull_request: @@ -14,25 +17,51 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: mobsuccess-devops/github-actions-packagejsonlint@master + sortpackagejson: + name: Sort Package Json + runs-on: ubuntu-20.04 + timeout-minutes: 7 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20.12.0 + - name: Cache Node Modules + id: cache + uses: actions/cache@v4 + env: + cache-name: cache-node-modules + with: + path: ./node_modules + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-20.12.0 + - run: echo "//npm.pkg.github.com/:_authToken=${{ secrets.MS_READ_PACKAGES_GITHUB_PAT }}" >> ~/.npmrc + name: Configure Credentials For GitHub Packages + - run: npm ci + if: steps.cache.outputs.cache-hit != 'true' + working-directory: . + - run: | + echo "💡 👉 Check not passing? see the doc at https://www.notion.so/mobsuccess/sort-package-json-de5cf4648e8545dbb5a2a5a910380535" + npx --yes sort-package-json@2.4.1 --check + working-directory: . prettier: name: Prettier runs-on: ubuntu-20.04 timeout-minutes: 7 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16.16.0 + node-version: 20.12.0 - name: Cache Node Modules id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-node-modules with: path: ./node_modules - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-16.16.0 + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-20.12.0 - run: echo "//npm.pkg.github.com/:_authToken=${{ secrets.MS_READ_PACKAGES_GITHUB_PAT }}" >> ~/.npmrc name: Configure Credentials For GitHub Packages - run: npm ci @@ -45,18 +74,18 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 7 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16.16.0 + node-version: 20.12.0 - name: Cache Node Modules id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-node-modules with: path: ./node_modules - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-16.16.0 + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-20.12.0 - run: echo "//npm.pkg.github.com/:_authToken=${{ secrets.MS_READ_PACKAGES_GITHUB_PAT }}" >> ~/.npmrc name: Configure Credentials For GitHub Packages - run: npm ci @@ -69,18 +98,18 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 7 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 16.16.0 + node-version: 20.12.0 - name: Cache Node Modules id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 env: cache-name: cache-node-modules with: path: ./node_modules - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-16.16.0 + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}-${{ hashFiles('**/package-lock.json') }}-node-20.12.0 - run: echo "//npm.pkg.github.com/:_authToken=${{ secrets.MS_READ_PACKAGES_GITHUB_PAT }}" >> ~/.npmrc name: Configure Credentials For GitHub Packages - run: npm ci