Make bash the default shell on windows

This commit is contained in:
Rodrigo Q. Saramago 2023-04-18 10:51:11 +02:00
parent 4a8d6618f5
commit ba722b66cb
No known key found for this signature in database
GPG Key ID: 9B36B2525704A359

View File

@ -398,21 +398,16 @@ defaults:
TERM: xterm TERM: xterm
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
- base_win_bash: &base_win_bash - base_win: &base_win
executor: executor:
name: win/default name: win/default
shell: bash.exe shell: bash.exe
- base_win_powershell: &base_win_powershell - base_win_large: &base_win_large
executor: executor:
name: win/default name: win/default
shell: powershell.exe
- base_win_powershell_large: &base_win_powershell_large
executor:
name: win/default
shell: powershell.exe
size: large size: large
shell: bash.exe
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Workflow Templates # Workflow Templates
@ -786,7 +781,7 @@ jobs:
- matrix_notify_failure_unless_pr - matrix_notify_failure_unless_pr
t_win_pyscripts: t_win_pyscripts:
<<: *base_win_powershell <<: *base_win
steps: steps:
- run: git config --global core.autocrlf false - run: git config --global core.autocrlf false
- checkout - checkout
@ -1350,7 +1345,7 @@ jobs:
path: reports/externalTests/base-branch/ path: reports/externalTests/base-branch/
b_win: &b_win b_win: &b_win
<<: *base_win_powershell_large <<: *base_win_large
steps: steps:
# NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config. # NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config.
- checkout - checkout
@ -1362,6 +1357,7 @@ jobs:
- run: - run:
name: "Installing dependencies" name: "Installing dependencies"
command: .\scripts\install_deps.ps1 command: .\scripts\install_deps.ps1
shell: powershell.exe
- save_cache: - save_cache:
key: dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }} key: dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
paths: paths:
@ -1369,9 +1365,11 @@ jobs:
- run: - run:
name: "Building solidity" name: "Building solidity"
command: .circleci/build_win.ps1 command: .circleci/build_win.ps1
shell: powershell.exe
- run: - run:
name: "Run solc.exe to make sure build was successful." name: "Run solc.exe to make sure build was successful."
command: .\build\solc\Release\solc.exe --version command: .\build\solc\Release\solc.exe --version
shell: powershell.exe
- store_artifacts: *artifact_solc_windows - store_artifacts: *artifact_solc_windows
- persist_to_workspace: - persist_to_workspace:
root: build root: build
@ -1381,7 +1379,7 @@ jobs:
- matrix_notify_failure_unless_pr - matrix_notify_failure_unless_pr
t_win_soltest: &t_win_soltest t_win_soltest: &t_win_soltest
<<: *base_win_powershell <<: *base_win
steps: steps:
# NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
# for files using CRLF that way. # for files using CRLF that way.
@ -1391,18 +1389,18 @@ jobs:
- run: - run:
name: "Install evmone" name: "Install evmone"
command: scripts/install_evmone.ps1 command: scripts/install_evmone.ps1
shell: powershell.exe
- run: - run:
name: "Run soltest" name: "Run soltest"
command: .circleci/soltest.ps1 command: .circleci/soltest.ps1
shell: powershell.exe
- run: - run:
name: Install LSP test dependencies name: Install LSP test dependencies
command: python -m pip install --user deepdiff colorama command: python -m pip install --user deepdiff colorama
- run:
name: Inspect lsp.py
command: Get-Content ./test/lsp.py
- run: - run:
name: Executing solc LSP test suite name: Executing solc LSP test suite
command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
shell: powershell.exe
- store_test_results: *store_test_results - store_test_results: *store_test_results
- store_artifacts: *artifacts_test_results - store_artifacts: *artifacts_test_results
- matrix_notify_failure_unless_pr - matrix_notify_failure_unless_pr
@ -1453,7 +1451,7 @@ jobs:
binary_path: "../build/solc/solc" binary_path: "../build/solc/solc"
b_bytecode_win: b_bytecode_win:
<<: *base_win_bash <<: *base_win
environment: environment:
LC_ALL: C LC_ALL: C
steps: steps: