Skip to content

Commit

Permalink
Merge pull request #21 from leaonline/feature-better-logs
Browse files Browse the repository at this point in the history
Feature better logs
  • Loading branch information
jankapunkt committed Nov 26, 2022
2 parents c793d21 + 435748a commit 794311f
Show file tree
Hide file tree
Showing 29 changed files with 597 additions and 241 deletions.
73 changes: 40 additions & 33 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '12.x'
node-version: 14

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node-14-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-node-14-
- run: npm install
- run: npm run lint:code
Expand All @@ -37,20 +37,20 @@ jobs:
needs: [lintcode]
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '12.x'
node-version: 14

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node-14-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-node-14-
- run: npm install
- run: npm run lint:style

Expand All @@ -60,20 +60,20 @@ jobs:
needs: [lintcode,lintstyle]
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '12.x'
node-version: 14

- name: cache dependencies
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node-14-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
${{ runner.os }}-node-14-
- run: npm install
- run: npm run lint:markdown
Expand All @@ -85,62 +85,69 @@ jobs:

# CHECKOUTS
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Checkout leaonline:testing repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/testing
path: github/testing

- name: Checkout leaonline:utils repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/utils
path: github/utils

- name: Checkout leaonline:corelib repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/corelib
path: github/corelib

- name: Checkout leaonline:ui repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/ui
path: github/ui

- name: Checkout leaonline:service-registry repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/service-registry
path: github/service-registry

- name: Checkout leaonline:theme repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: leaonline/theme
path: github/theme

- name: Checkout Collection2
uses: actions/checkout@v3
with:
repository: Meteor-Community-Packages/meteor-collection2
path: github/meteor-collection2
ref: release/v4

# CACHING
- name: Install Meteor
id: cache-meteor-install
uses: actions/cache@v2
with:
path: ~/.meteor
key: v1-meteor-${{ hashFiles('.meteor/versions') }}
key: v3-meteor-${{ hashFiles('.meteor/versions') }}
restore-keys: |
v1-meteor-
v3-meteor-
- name: Cache NPM dependencies
id: cache-meteor-npm
uses: actions/cache@v2
with:
path: ~/.npm
key: v1-npm-${{ hashFiles('package-lock.json') }}
key: v3-npm-${{ hashFiles('package-lock.json') }}
restore-keys: |
v1-npm-
v3-npm-
- name: Cache Meteor build
id: cache-meteor-build
Expand All @@ -151,14 +158,14 @@ jobs:
.meteor/local/plugin-cache
.meteor/local/isopacks
.meteor/local/bundler-cache/scanner
key: v1-meteor_build_cache-${{ github.ref }}-${{ github.sha }}
key: v3-meteor_build_cache-${{ github.ref }}-${{ github.sha }}
restore-key: |
v1-meteor_build_cache-
v3-meteor_build_cache-
- name: Setup meteor
uses: meteorengineer/setup-meteor@v1
with:
meteor-release: '2.2'
meteor-release: '2.7.3'

- name: Install NPM Dependencies
run: meteor npm ci
Expand All @@ -178,7 +185,7 @@ jobs:
needs: [tests]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Download coverage
uses: actions/download-artifact@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public/fonts/
public/logos/

.deploy
.production

# Logs
logs
Expand Down
18 changes: 9 additions & 9 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

meteor-base@1.5.1 # Packages every Meteor app needs to have
mobile-experience@1.1.0 # Packages for a great mobile UX
mongo@1.13.0 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
mongo@1.15.0 # The database Meteor supports right now
blaze-html-templates@2.0.0 # Compile .html files into Meteor Blaze views
reactive-var@1.0.11 # Reactive variable for tracker
tracker@1.2.0 # Meteor's client-side reactive programming library

# standard-minifier-css@1.5.3 # CSS minifier run for production mode
standard-minifier-js@2.7.1 # JS minifier run for production mode
standard-minifier-js@2.8.0 # JS minifier run for production mode
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
ecmascript@0.16.0 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.16.2 # Enable ECMAScript2015+ syntax in app code
# shell-server@0.5.0 # Server-side component of the `meteor shell` command


Expand Down Expand Up @@ -44,7 +44,7 @@ leaonline:publication-factory
leaonline:ratelimit-factory

# Collections
aldeed:collection2
aldeed:collection2@4.0.0!
dburles:mongo-collection-instances@0.3.6

# files
Expand All @@ -55,15 +55,15 @@ dburles:mongo-collection-instances@0.3.6
mdg:validated-method

# Accounts
accounts-base@2.2.0
accounts-password@2.2.0
accounts-base@2.2.3
accounts-password@2.3.1
leaonline:ddp-login
leaonline:ddp-login-handler
service-configuration@1.3.0

# UI
reactive-dict@1.3.0
hot-module-replacement@0.4.0
hot-module-replacement@0.5.1
blaze-hot

fourseven:scss@4.15.0
Expand All @@ -82,7 +82,7 @@ jkuester:template-loader
ccorcos:subs-cache

# reporting
email@2.2.0
email@2.2.1

#========================================
# SECURITY
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.5
METEOR@2.7.3
Loading

0 comments on commit 794311f

Please sign in to comment.