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

[chore] fixes CI to avoid race conditions #1692

Merged
merged 2 commits into from Oct 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
@@ -1,5 +1,8 @@
name: CI
on: [push]
push:
branches: [main]
pull_request:
branches: [main]
jobs:
build:
name: test Node ${{ matrix.node }} Webpack ${{ matrix.webpack }} ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion examples/javascript/dist/webpack-5/index.html
@@ -1 +1 @@
<head><script defer="defer" src="bundle.js"></script><link href="styles.css" rel="stylesheet"></head>Hello World from backend2021-10-09T14:25:52.580Z<h2>Partial</h2><img src="55b19870aff2e53d1fb1.png">
<head><script defer="defer" src="bundle.js"></script><link href="styles.css" rel="stylesheet"></head>Hello World from backend2021-10-16T17:01:43.132Z<h2>Partial</h2><img src="55b19870aff2e53d1fb1.png">
2 changes: 1 addition & 1 deletion examples/pug-loader/dist/webpack-5/index.html
@@ -1 +1 @@
<!doctype html><html><head><title>pug demo</title><link rel="icon" href="favicon.ico"><script defer="defer" src="bundle.js"></script><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1999-01-01T05:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div></body></html>
<!doctype html><html><head><title>pug demo</title><link rel="icon" href="favicon.ico"><script defer="defer" src="bundle.js"></script><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1999-01-01T08:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div></body></html>
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -32,9 +32,9 @@
"commitizen": "^4.2.4",
"css-loader": "5.0.1",
"cz-conventional-changelog": "2.1.0",
"dir-compare": "1.7.2",
"dir-compare": "^3.3.0",
"html-loader": "2.1.1",
"jest": "26.5.3",
"jest": "^27.2.5",
"mini-css-extract-plugin": "^1.6.0",
"pug": "3.0.2",
"pug-loader": "2.4.0",
Expand Down
8 changes: 0 additions & 8 deletions spec/support/jasmine.json

This file was deleted.