Skip to content

Commit 5f5e356

Browse files
committed
Merge branch 'master' into doz
# Conflicts: # frameworks/keyed/doz/index.html # frameworks/keyed/doz/package.json # frameworks/keyed/doz/src/index.js
2 parents abcd499 + 06608a8 commit 5f5e356

File tree

2,340 files changed

+1634193
-213547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,340 files changed

+1634193
-213547
lines changed

.circleci/config.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ jobs:
77
- checkout
88

99
- run: |
10-
curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
10+
curl -L -o google-chrome.deb https://s3.amazonaws.com/circle-downloads/google-chrome-stable_current_amd64_47.0.2526.73-1.deb
1111
sudo dpkg -i google-chrome.deb
1212
sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
1313
rm google-chrome.deb
14-
15-
- run: |
14+
export TERM=xterm-256color
1615
source $NVM_DIR/nvm.sh
17-
nvm install v8.9.1
18-
16+
nvm install v10.16.0
1917
npm install
18+
npm run install-webdriver-ts
2019
npm start &
21-
npm run build -- --skipIrrelevant --check
20+
npm run build -- --check
21+
22+
dependencies:
23+
pre:
24+
- curl -s https://raw.githubusercontent.com/chronogolf/circleci-google-chrome/master/use_chrome_stable_version.sh | bash

.dockerignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.circleci/
2+
.dockerignore
3+
.git/
4+
.gitignore
5+
cleanup.js
6+
configureStyles.js
7+
copy.js
8+
favicon.ico
9+
frameworks/
10+
images/
11+
LICENSE
12+
node_modules/
13+
package-lock.json
14+
README.md
15+
results-ui/
16+
webdriver-ts/
17+
webdriver-ts-results/

.gitignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,18 @@ dist
3535
*.iml
3636
TODO.txt
3737
*/dist/
38+
**/crui/.awcache
39+
**/angular*/.angular
3840
angular*/app/app.js
3941
angular*/app/app.js.map
4042
angular*/src/app.ngsummary.json
4143
tests/results/completed/
4244
target/
4345
webdriver-ts/results/
44-
webdriver-ts/results*
46+
webdriver-ts/traces/
47+
webdriver-ts/results*/
48+
webdriver-ts/traces*/
49+
webdriver-ts/old_results/
4550
webdriver-ts-results/table_*.html
4651
webdriver-ts/table_*.html
4752
webdriver-ts/error-*.png
@@ -54,13 +59,12 @@ marko-*/.cache
5459
marko-*/static
5560
marko-*/build
5661
marko-*/src/xtable.marko
62+
**/hyperoop/.rpt2_cache
5763

5864
# keep root yarn.lock in repo so that travis will install yarn
5965
yarn.lock
6066
!/yarn.lock
6167

62-
package-lock.json
63-
6468
# angular 2 aot
6569
angular-*/lib/
6670
**/app.ngfactory.ts
@@ -74,3 +78,8 @@ glimmer-*/tmp
7478
.cargo/
7579
.rustup/
7680
Cargo.lock
81+
82+
# emacs
83+
*~
84+
frameworks/keyed/doohtml/js/doo.html.min.js.LICENSE.txt
85+
frameworks/non-keyed/doohtml/js/doo.html.min.js.LICENSE.txt

.travis.yml

Lines changed: 0 additions & 95 deletions
This file was deleted.

Chrome_Results.ods

42.9 KB
Binary file not shown.

Dockerfile

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
2+
FROM ubuntu:21.10
3+
COPY install_rust.sh /root/
4+
RUN echo "unsafe-perm = true" > /root/.npmrc
5+
RUN echo "NG_CLI_ANALYTICS=ci" >> /root/.npmrc
6+
RUN echo "{ \"allow_root\": true }" > /root/.bowerrc
7+
8+
# replace shell with bash so we can source files
9+
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
10+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
11+
12+
RUN apt-get update
13+
RUN apt-get install -y python3 m4 libtinfo5 libghc-zlib-dev rsync ghc haskell-stack curl g++ make git openjdk-8-jdk dos2unix python
14+
15+
ENV NVM_DIR /usr/local/nvm
16+
RUN mkdir -p $NVM_DIR
17+
ENV NODE_VERSION 16.15.1
18+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
19+
20+
# install node and npm
21+
RUN source $NVM_DIR/nvm.sh \
22+
&& nvm install $NODE_VERSION \
23+
&& nvm alias default $NODE_VERSION \
24+
&& nvm use default
25+
26+
# add node and npm to path so the commands are available
27+
ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
28+
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
29+
30+
RUN mkdir /server
31+
RUN mkdir /build
32+
RUN mkdir /src
33+
34+
# Volume before chown changes owwner
35+
VOLUME /src
36+
VOLUME /build
37+
COPY package.json /build
38+
WORKDIR /build
39+
40+
# Install rust
41+
RUN dos2unix /root/install_rust.sh
42+
RUN bash /root/install_rust.sh
43+
44+
# Create server
45+
46+
COPY server /server
47+
WORKDIR /server
48+
RUN npm install
49+
50+
# USER user
51+
52+
RUN npm install
53+
EXPOSE 8080
54+
WORKDIR /build
55+
CMD ["mkdir", "/build/frameworks"]
56+
CMD ["mkdir", "/build/frameworks/keyed"]
57+
CMD ["mkdir", "/build/frameworks/non-keyed"]
58+
CMD ["/server/runserver-docker.sh"]
59+
#CMD ["node","index.js"]
60+

Linux_results.ods

10.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)