diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/build.yml b/src/Umbraco.Web.UI.Client/.github/workflows/build.yml deleted file mode 100644 index 4a8f96ea58..0000000000 --- a/src/Umbraco.Web.UI.Client/.github/workflows/build.yml +++ /dev/null @@ -1,40 +0,0 @@ -# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions - -name: Build - -on: - push: - branches: - - main - - release/* - pull_request: - branches: - - main - - release/* - - # Allows GitHub to use this workflow to validate the merge queue - merge_group: - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -env: - NODE_OPTIONS: --max_old_space_size=16384 - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version-file: .nvmrc - cache: npm - cache-dependency-path: ./package-lock.json - - run: npm ci --no-audit --no-fund --prefer-offline - - run: npm run lint:errors - - run: npm run build:for:cms - - run: npm run generate:jsonschema:dist diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/test.yml b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml similarity index 73% rename from src/Umbraco.Web.UI.Client/.github/workflows/test.yml rename to src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml index 199d177548..341335e79d 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/test.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/build_test.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions -name: Test +name: Build on: push: @@ -25,7 +25,21 @@ env: jobs: build: runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version-file: .nvmrc + cache: npm + cache-dependency-path: ./package-lock.json + - run: npm ci --no-audit --no-fund --prefer-offline + - run: npm run lint:errors + - run: npm run build:for:cms + - run: npm run generate:jsonschema:dist + test: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Use Node.js