Skip to content

Commit d1daaa4

Browse files
authored
Merge branch 'main' into docs-metrics
2 parents 0c9261c + 6ab5164 commit d1daaa4

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

ansible/roles/baselayout/tasks/partials/ccache/aix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
- g++
5656
- gcc
5757
- gcov
58-
- g++-6
59-
- gcc-6
6058
- g++-8
6159
- gcc-8
6260
- gcc-10
6361
- g++-10
62+
- gcc-12
63+
- g++-12
6464

6565
- name: "ccache : cleanup - aix tarball"
6666
file:

ansible/roles/baselayout/vars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ packages: {
4949
],
5050

5151
aix72: [
52-
'gcc6-c++,gcc8-c++,gcc10-c++'
52+
'gcc8-c++,gcc10-c++,gcc12-c++'
5353
],
5454

5555
aix73: [
56-
'gcc8-c++,gcc10-c++'
56+
'gcc8-c++,gcc10-c++,gcc12-c++'
5757
],
5858

5959
ibmi: [

ansible/roles/metrics/files/process-cloudflare/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@google-cloud/storage": "^5.0.0",
1717
"body-parser": "^1.19.0",
1818
"express": "^4.17.1",
19-
"moment": "^2.29.1",
2019
"split2": "~3.1.1",
2120
"strftime": "~0.10.0"
2221
},

ansible/roles/metrics/files/summaries/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"dependencies": {
1313
"@google-cloud/storage": "^5.0.0",
1414
"body-parser": "^1.19.0",
15-
"express": "^4.17.1",
16-
"moment": "^2.29.1"
15+
"express": "^4.17.1"
1716
},
1817
"devDependencies": {
1918
"eslint": "^7.8.1"

ansible/roles/metrics/files/summaries/summaries.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//
66

77
const { Storage } = require('@google-cloud/storage')
8-
const moment = require('moment')
98
const express = require('express')
109
const bodyParser = require('body-parser')
1110
const app = express()
@@ -65,10 +64,8 @@ function summary (chunk) {
6564
return
6665
}
6766

68-
async function collectData () {
67+
async function collectData (date) {
6968
const storage = new Storage()
70-
let date = moment(new Date())
71-
date = moment(date, 'YYYYMMDD').subtract(1, 'days').format('YYYYMMDD')
7269
const filePrefix = date.toString().concat('/')
7370
console.log(filePrefix)
7471
const [files] = await storage.bucket('processed-logs-nodejs').getFiles({ prefix: `${filePrefix}`})
@@ -85,12 +82,10 @@ async function collectData () {
8582
}
8683
}
8784

88-
async function produceSummaries () {
85+
async function produceSummaries (date) {
8986
const storage = new Storage()
90-
await collectData()
87+
await collectData(date)
9188
prepare()
92-
let date = moment(new Date())
93-
date = moment(date, 'YYYYMMDD').subtract(1, 'days').format('YYYYMMDD')
9489
let outputFile = "nodejs.org-access.log." + date.toString() + ".json"
9590
storage.bucket('access-logs-summaries-nodejs').file(outputFile).save(JSON.stringify(counts), function (err) {
9691
if (err) {
@@ -102,7 +97,10 @@ async function produceSummaries () {
10297
}
10398

10499
app.post('/', async (req, res) => {
105-
await produceSummaries()
100+
// ToDo: accept optional date parameter https://github.com/nodejs/build/issues/3780
101+
const yesterday = new Date().getTime() - (24 * 60 * 60 * 1000)
102+
const date = new Date(yesterday).toISOString().slice(0, 10).replace(/-/g, '')
103+
await produceSummaries(date)
106104
res.status(200).send()
107105
})
108106

ansible/roles/visual-studio/tasks/partials/vs2022.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- name: install Visual Studio Community 2022 Native Desktop Workload
1414
win_chocolatey:
1515
name: visualstudio2022-workload-nativedesktop
16-
params: '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.NetCore.Component.SDK --add Microsoft.VisualStudio.Component.VC.Llvm.Clang'
16+
params: '--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 --add Microsoft.VisualStudio.Component.VC.ATL.ARM64 --add Microsoft.NetCore.Component.SDK --add Microsoft.VisualStudio.Component.VC.Llvm.Clang --add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset'
1717

1818
- name: install WiX Toolset
1919
import_tasks: 'wixtoolset.yml'

0 commit comments

Comments
 (0)