Skip to content

ci: merge staging to master #21

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

Merged
merged 3 commits into from
Jul 21, 2022
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ variables:
GH_PROJECT_PATH: "MatrixAI/${CI_PROJECT_NAME}"
GH_PROJECT_URL: "https://${GITHUB_TOKEN}@github.com/${GH_PROJECT_PATH}.git"
# Cache .npm
NPM_CONFIG_CACHE: "${CI_PROJECT_DIR}/tmp/npm"
npm_config_cache: "${CI_PROJECT_DIR}/tmp/npm"
# Prefer offline node module installation
NPM_CONFIG_PREFER_OFFLINE: "true"
npm_config_prefer_offline: "true"
# Homebrew cache only used by macos runner
HOMEBREW_CACHE: "${CI_PROJECT_DIR}/tmp/Homebrew"

Expand Down Expand Up @@ -50,7 +50,7 @@ check:lint:
needs: []
script:
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
npm run lint;
npm run lint-shell;
'
Expand All @@ -68,7 +68,7 @@ check:test:
needs: []
script:
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
npm test -- --ci --coverage;
'
artifacts:
Expand All @@ -95,7 +95,7 @@ build:merge:
# Required for `gh pr create`
- git remote add upstream "$GH_PROJECT_URL"
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
gh pr create \
--head staging \
--base master \
Expand Down Expand Up @@ -138,7 +138,7 @@ build:linux:
needs: []
script:
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
npm test -- --ci --coverage;
npm run bench;
'
Expand Down Expand Up @@ -231,7 +231,7 @@ build:prerelease:
- echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ./.npmrc
- echo 'Publishing library prerelease'
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
npm publish --tag prerelease --access public;
'
after_script:
Expand Down Expand Up @@ -263,7 +263,7 @@ integration:merge:
GIT_DEPTH: 0
script:
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
printf "Pipeline Succeeded on ${CI_PIPELINE_ID} for ${CI_COMMIT_SHA}\n\n${CI_PIPELINE_URL}" \
| gh pr comment staging \
--body-file - \
Expand Down Expand Up @@ -294,7 +294,7 @@ release:distribution:
- echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ./.npmrc
- echo 'Publishing library'
- >
nix-shell --arg ci true --run '
nix-shell --arg ci true --run $'
npm publish --access public;
'
after_script:
Expand Down
14 changes: 7 additions & 7 deletions benches/results/logger_filtered.chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</head>
<body>
<div class="container">
<canvas id="chart1658376668280" width="16" height="9"></canvas>
<canvas id="chart1658391353045" width="16" height="9"></canvas>
</div>
<script>
const format = (num) => {
Expand All @@ -51,18 +51,18 @@
chunked.map((chunk) => chunk.join('')).join(' ') + fractionStr
)
}
const ctx1658376668280 = document
.getElementById('chart1658376668280')
const ctx1658391353045 = document
.getElementById('chart1658391353045')
.getContext('2d')
const chart1658376668280 = new Chart(ctx1658376668280, {
const chart1658391353045 = new Chart(ctx1658391353045, {
type: 'bar',
data: {
labels: ["log level","keys regex"],
datasets: [
{
data: [188231858,194173392],
backgroundColor: ["hsl(116.32799999999999, 85%, 55%)","hsl(120, 85%, 55%)"],
borderColor: ["hsl(116.32799999999999, 85%, 55%)","hsl(120, 85%, 55%)"],
data: [164803877,166665103],
backgroundColor: ["hsl(118.65599999999999, 85%, 55%)","hsl(120, 85%, 55%)"],
borderColor: ["hsl(118.65599999999999, 85%, 55%)","hsl(120, 85%, 55%)"],
borderWidth: 2,
},
],
Expand Down
Loading