Skip to content

Commit

Permalink
upgrade nodejs; add nimCiSystemInfo on azure/github CI (#18003)
Browse files Browse the repository at this point in the history
* upgrade nodejs; add nimCiSysmtemInfo on all CI

* fix typo
  • Loading branch information
timotheecour authored May 13, 2021
1 parent 3bc625a commit 3c622d7
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ jobs:
shell: bash
run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}"

- name: 'System information'
shell: bash
run: . ci/funs.sh && nimCiSystemInfo

- name: 'Build csourcesAny (posix)'
# this would work on windows and other CI use this on windows,
# but we ensure here that `ci/build_autogen.bat` keeps working on windows.
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
with:
fetch-depth: 2

- name: 'Install node.js 12.x'
- name: 'Install node.js 16.x'
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '16.x'

- name: 'Install dependencies (Linux amd64)'
if: runner.os == 'Linux' && matrix.cpu == 'amd64'
Expand Down Expand Up @@ -51,6 +51,10 @@ jobs:
shell: bash
run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}"

- name: 'System information'
shell: bash
run: . ci/funs.sh && nimCiSystemInfo

- name: 'Build csourcesAny'
shell: bash
run: . ci/funs.sh && nimBuildCsourcesIfNeeded CC=gcc ucpu='${{ matrix.cpu }}'
Expand Down
15 changes: 3 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ jobs:
- task: NodeTool@0
inputs:
versionSpec: '12.x'
displayName: 'Install node.js 12.x'
versionSpec: '16.x'
displayName: 'Install node.js 16.x'
condition: and(succeeded(), eq(variables['skipci'], 'false'))

- bash: |
Expand Down Expand Up @@ -147,16 +147,7 @@ jobs:
condition: and(succeeded(), eq(variables['skipci'], 'false'))
displayName: 'Add build binaries to PATH'

- bash: |
set -e
. ci/funs.sh
echo_run echo 'PATH:' "$PATH"
echo_run echo '##[section]gcc version'
echo_run gcc -v
echo_run echo '##[section]nodejs version'
echo_run node -v
echo_run echo '##[section]make version'
echo_run make -v
- bash: . ci/funs.sh && nimCiSystemInfo
condition: and(succeeded(), eq(variables['skipci'], 'false'))
displayName: 'System information'

Expand Down
15 changes: 14 additions & 1 deletion ci/funs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
echo_run () {
# echo's a command before running it, which helps understanding logs
echo ""
echo "$@"
echo "cmd: $@" # in azure we could also use this: echo '##[section]"$@"'
"$@"
}

Expand Down Expand Up @@ -67,6 +67,19 @@ _nimBuildCsourcesIfNeeded(){
echo_run cp bin/nim $nim_csources
}

nimCiSystemInfo(){
nimDefineVars
echo_run eval echo '$'nim_csources
echo_run pwd
echo_run date
echo_run uname -a
echo_run git log --no-merges -1 --pretty=oneline
echo_run eval echo '$'PATH
echo_run gcc -v
echo_run node -v
echo_run make -v
}

nimCsourcesHash(){
nimDefineVars
echo $nim_csourcesHash
Expand Down

0 comments on commit 3c622d7

Please sign in to comment.