Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed an error in the automation file #3

Merged
merged 12 commits into from
Oct 1, 2024
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@chrisolsen @ArakTaiRoth @vanessatran-ddi @syedszeeshan @lizhuomeng71
18 changes: 11 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,22 @@ on:
workflow_dispatch:

jobs:
main:
build:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v4
- uses: actions/setup-node@v2
with:
node-version: "20"
- uses: actions/cache@v2
with:
node-version: 20
cache: 'npm'
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
- run: npm ci
- name: Build
run: npm run build
run: npm run build
- name: Test
- run: npm run test
run: npm run test
2 changes: 2 additions & 0 deletions apps/react/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { StrictMode } from 'react';
import * as ReactDOM from 'react-dom/client';
import { BrowserRouter, Route, Routes } from "react-router-dom";

import "@abgov/web-components";

import App from './app/app';

import Bug1142Page from "./bugs/Bug1142Page";
Expand Down
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,5 @@
"linter": "eslint"
}
}
},
"nxCloudAccessToken": "NDY5NDZkZmMtNzExNS00ZjhlLWFkZTYtYjBlMGFlNmI0MTgyfHJlYWQtd3JpdGU="
}
}
81 changes: 46 additions & 35 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
"build:react": "npx nx run react:build",
"run:angular": "npx nx run angular:serve",
"run:react": "npx nx run react:serve",
"test": "(npm run test:angular & npm run test:react",
"test": "(npm run test:angular & npm run test:react)",
"test:angular": "npx nx run angular-e2e:e2e",
"test:react": "npx nx run react-e2e:e2e",
"test:specific": "(npx nx run angular-e2e:e2e --spec=src\\e2e\\bug%npm_config_bug%.cy.ts & npx nx run react-e2e:e2e --spec=src\\e2e\\bug%npm_config_bug%.cy.ts)"
},
"private": true,
"dependencies": {
"@abgov/angular-components": "3.0.3",
"@abgov/react-components": "4.23.0",
"@abgov/web-components": "1.24.0",
"@abgov/angular-components": "3.2.0",
"@abgov/react-components": "5.2.0",
"@abgov/web-components": "1.27.0",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
Expand All @@ -33,6 +33,7 @@
"react-router-dom": "^6.26.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"xvfb": "0.4.0",
"zone.js": "~0.14.3"
},
"devDependencies": {
Expand Down
Loading