From d6b578499dc2f78518f72be8629d549aa7d2611e Mon Sep 17 00:00:00 2001 From: Maxime GRIS Date: Sun, 13 Mar 2022 15:31:06 +0100 Subject: [PATCH] fix: github action --- .github/workflows/macos.yml | 5 ++++- .github/workflows/ubuntu.yml | 15 +++++++++++---- .github/workflows/windows.yml | 11 ++++++++++- angular.json | 6 ++++-- docs/_config.yml | 1 - docs/index.md | 37 ------------------------------------- 6 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 docs/_config.yml delete mode 100644 docs/index.md diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 35c2a48..41a0d0f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16] # The type of runner that the job will run on runs-on: macos-latest @@ -44,9 +44,12 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - name: Install Dependencies run: npm i && npm i -D cli-truncate + - name: Check lint run: npm run lint + - name: Build the app run: npm run electron:build diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d0568eb..4774c12 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16] # The type of runner that the job will run on runs-on: ubuntu-18.04 @@ -44,20 +44,27 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + + - name: Install linux dependencies + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf + - name: Install Dependencies run: npm i + - name: Check lint run: npm run lint - - name: Build the app - run: npm run electron:build - name: Run headless unit test uses: GabrielBB/xvfb-action@v1 with: - run: npm test + run: npm run test - name: Run headless e2e test uses: GabrielBB/xvfb-action@v1 with: run: npm run e2e + - name: Build the app + run: npm run electron:build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 772f5a6..bf75c90 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - node-version: [14.x, 16.x, 17.x] + node-version: [16] # The type of runner that the job will run on runs-on: windows-latest @@ -44,9 +44,18 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - name: Install Dependencies run: npm i + - name: Check lint run: npm run lint + + - name: Run headless unit test + run: npm run test + + - name: Run headless e2e test + run: npm run e2e + - name: Build the app run: npm run electron:build diff --git a/angular.json b/angular.json index 14f0c70..9ba5fe5 100644 --- a/angular.json +++ b/angular.json @@ -28,6 +28,7 @@ "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", "polyfills": "src/polyfills.ts", + "inlineStyleLanguage": "scss", "assets": [ "src/favicon.ico", "src/assets" @@ -141,12 +142,13 @@ "polyfills": "src/polyfills-test.ts", "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", + "inlineStyleLanguage": "scss", "scripts": [], "styles": [ - "src/favicon.ico", - "src/assets" + "src/styles.scss" ], "assets": [ + "src/favicon.ico", "src/assets" ], "customWebpackConfig": { diff --git a/docs/_config.yml b/docs/_config.yml deleted file mode 100644 index c419263..0000000 --- a/docs/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-cayman \ No newline at end of file diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index 5a1275e..0000000 --- a/docs/index.md +++ /dev/null @@ -1,37 +0,0 @@ -## Welcome to GitHub Pages - -You can use the [editor on GitHub](https://github.com/maximegris/angular-electron/edit/main/docs/index.md) to maintain and preview the content for your website in Markdown files. - -Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files. - -### Markdown - -Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for - -```markdown -Syntax highlighted code block - -# Header 1 -## Header 2 -### Header 3 - -- Bulleted -- List - -1. Numbered -2. List - -**Bold** and _Italic_ and `Code` text - -[Link](url) and ![Image](src) -``` - -For more details see [Basic writing and formatting syntax](https://docs.github.com/en/github/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax). - -### Jekyll Themes - -Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/maximegris/angular-electron/settings/pages). The name of this theme is saved in the Jekyll `_config.yml` configuration file. - -### Support or Contact - -Having trouble with Pages? Check out our [documentation](https://docs.github.com/categories/github-pages-basics/) or [contact support](https://support.github.com/contact) and we’ll help you sort it out.