diff --git a/.github/workflows/ci.material-aio.yml b/.github/workflows/ci.material-aio.yml index 5f3e95d96ae1..a9758e5e6318 100644 --- a/.github/workflows/ci.material-aio.yml +++ b/.github/workflows/ci.material-aio.yml @@ -5,8 +5,6 @@ on: branches: - main - '[0-9]+.[0-9]+.x' - paths: - - 'material.angular.io/**' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -27,11 +25,11 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Linting - run: pnpm --cwd=docs bazel test --test_tag_filters=lint //... + run: pnpm bazel test --test_tag_filters=lint //docs/... build: runs-on: ubuntu-latest @@ -41,11 +39,11 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Build - run: pnpm -s --cwd=docs bazel build //... + run: pnpm -s build //docs/... test: runs-on: ubuntu-latest @@ -55,11 +53,11 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Tests - run: pnpm --cwd=docs bazel test --test_tag_filters=-lint,-e2e,-audit //... + run: pnpm bazel test --test_tag_filters=-lint,-e2e,-audit //docs/... - name: Store Test Logs uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 if: always() @@ -76,11 +74,11 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Lighthouse Audit - run: pnpm -s --cwd=docs bazel test --test_tag_filters=audit //... + run: pnpm -s bazel test --test_tag_filters=audit //docs/... - name: Store Audit Logs uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 if: always() diff --git a/.github/workflows/pr.material-aio.yml b/.github/workflows/pr.material-aio.yml index 064be73c02d5..74ddd6b2a426 100644 --- a/.github/workflows/pr.material-aio.yml +++ b/.github/workflows/pr.material-aio.yml @@ -3,8 +3,6 @@ name: 'PR (material.angular.io)' on: pull_request: types: [opened, synchronize, reopened] - paths: - - 'material.angular.io/**' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -25,7 +23,7 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Linting @@ -39,7 +37,7 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Build @@ -53,7 +51,7 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Tests @@ -74,7 +72,7 @@ jobs: - name: Setup Bazel uses: angular/dev-infra/github-actions/bazel/setup@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Setup Bazel RBE - uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4 + uses: angular/dev-infra/github-actions/bazel/configure-remote@e4bf37af223483ce00f9316d227fd62cd744dc4b - name: Install node modules run: pnpm install --frozen-lockfile - name: Execute Lighthouse Audit diff --git a/WORKSPACE b/WORKSPACE index 75a500486517..1a6ad37ab764 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,14 +3,6 @@ workspace( name = "angular_material", ) -# Point to the nested WORKSPACE we merged from github.com/angular/material.angular.io -# NB: even though this isn't referenced anywhere, it's required for Bazel to know about the -# nested workspace so that wildcard patterns like //... don't descend into it. -local_repository( - name = "material_angular_io", - path = "./material.angular.io", -) - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Add NodeJS rules