-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Reenable Windows CI build with Artifactory support #4596
Merged
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
ab52f3c
ci: use Artifactory remote in windows workflow
ximinez 3df07fb
Merge remote-tracking branch 'upstream/develop' into action
ximinez f31ebff
Merge remote-tracking branch 'upstream/develop' into action
ximinez e0a84e0
Merge remote-tracking branch 'upstream/develop' into action
ximinez 10f25ff
Merge remote-tracking branch 'upstream/develop' into action
ximinez e88ca37
Merge remote-tracking branch 'upstream/develop' into action
ximinez 1b5e089
Merge remote-tracking branch 'upstream/develop' into action
ximinez 9c0882f
[FOLD] Run on self-hosted runner
ximinez 069aebb
fixup! [FOLD] Run on self-hosted runner
ximinez ab26e5c
fixup! fixup! [FOLD] Run on self-hosted runner
ximinez 106596b
Merge remote-tracking branch 'upstream/develop' into action
ximinez b42edc1
Merge remote-tracking branch 'upstream/develop' into action
ximinez 5cfa42c
Merge remote-tracking branch 'upstream/develop' into action
ximinez 5d661f5
Merge remote-tracking branch 'upstream/develop' into action
ximinez f568ac0
Merge remote-tracking branch 'upstream/develop' into action
ximinez f01002f
Merge remote-tracking branch 'upstream/develop' into action
ximinez 9c15e2a
Merge remote-tracking branch 'upstream/develop' into action
ximinez 77a8f2c
Revert "fixup! fixup! [FOLD] Run on self-hosted runner"
ximinez de2df5d
Revert "fixup! [FOLD] Run on self-hosted runner"
ximinez a35dd82
Revert "[FOLD] Run on self-hosted runner"
ximinez efd32a6
Merge remote-tracking branch 'upstream/develop' into action
ximinez 0fecaf7
Merge remote-tracking branch 'upstream/develop' into action
ximinez 4cd85a6
Try using one unit test job?
ximinez 43690b3
Merge remote-tracking branch 'upstream/develop' into action
ximinez 2f3ddde
Merge remote-tracking branch 'upstream/develop' into action
ximinez 222c7e4
[FOLD] Address review feedback from @thejohnfreeman:
ximinez 715aeea
fixup! [FOLD] Address review feedback from @thejohnfreeman:
ximinez 1641cc6
fixup! fixup! [FOLD] Address review feedback from @thejohnfreeman:
ximinez f875a86
[FOLD] Further feedback from @thejohnfreeman:
ximinez 63c6717
Merge remote-tracking branch 'upstream/develop' into action
ximinez e308801
Merge remote-tracking branch 'upstream/develop' into action
ximinez 8f1c1e4
[FOLD] Improve remote setup step
ximinez 15f1f0c
fixup! [FOLD] Improve remote setup step
ximinez 5778a34
Merge remote-tracking branch 'upstream/develop' into action
ximinez 7fdd63c
Merge remote-tracking branch 'upstream/develop' into action
ximinez c3bce68
Merge remote-tracking branch 'upstream/develop' into action
ximinez 5f3a938
Merge remote-tracking branch 'upstream/develop' into action
ximinez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,11 @@ | ||
name: windows | ||
# We have disabled this workflow because it fails in our CI Windows | ||
# environment, but we cannot replicate the failure in our personal Windows | ||
# test environments, nor have we gone through the trouble of setting up an | ||
# interactive CI Windows environment. | ||
# We welcome contributions to diagnose or debug the problems on Windows. Until | ||
# then, we leave this tombstone as a reminder that we have tried (but failed) | ||
# to write a reliable test for Windows. | ||
# on: [push, pull_request] | ||
on: | ||
workflow_dispatch: | ||
push: | ||
branches: | ||
- 'action' | ||
paths: | ||
- '.github/workflow/windows.yml' | ||
|
||
on: [push, pull_request] | ||
|
||
# https://docs.github.com/en/actions/using-jobs/using-concurrency | ||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.ref }} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
|
||
|
@@ -25,6 +17,11 @@ jobs: | |
- Visual Studio 16 2019 | ||
configuration: | ||
- Release | ||
# Github hosted runners tend to hang when running Debug unit tests. | ||
# Instead of trying to work around it, disable the Debug job until | ||
# something beefier (i.e. a heavy self-hosted runner) becomes | ||
# available. | ||
# - Debug | ||
runs-on: windows-2019 | ||
env: | ||
build_dir: .build | ||
|
@@ -37,11 +34,12 @@ jobs: | |
python-version: 3.9 | ||
- name: learn Python cache directory | ||
id: pip-cache | ||
shell: bash | ||
run: | | ||
pip install --upgrade pip | ||
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT | ||
echo "dir=$(pip cache dir)" | tee ${GITHUB_OUTPUT} | ||
- name: restore Python cache directory | ||
uses: actions/cache@v2 | ||
uses: actions/cache@v3 | ||
with: | ||
path: ${{ steps.pip-cache.outputs.dir }} | ||
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }} | ||
|
@@ -55,45 +53,48 @@ jobs: | |
cmake --version | ||
dir env: | ||
- name: configure Conan | ||
shell: bash | ||
env: | ||
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod | ||
run: | | ||
conan profile new default --detect | ||
conan profile update settings.compiler.cppstd=20 default | ||
conan profile update settings.compiler.runtime=MT default | ||
conan profile update settings.compiler.toolset=v141 default | ||
- name: learn Conan cache directory | ||
id: conan-cache | ||
run: | | ||
echo "dir=$(conan config get storage.path)" >> $GITHUB_OUTPUT | ||
- name: restore Conan cache directory | ||
uses: actions/cache@v2 | ||
with: | ||
path: ${{ steps.conan-cache.outputs.dir }} | ||
key: ${{ hashFiles('~/.conan/profiles/default', 'conanfile.py', 'external/rocksdb/*', '.github/workflows/windows.yml') }} | ||
- name: export custom recipes | ||
conan profile update settings.compiler.runtime=MT${{ matrix.configuration == 'Debug' && 'd' || '' }} default | ||
# Do not quote the URL. An empty string will be accepted (with | ||
# a non-fatal warning), but a missing argument will not. | ||
conan remote add ripple ${{ env.CONAN_URL }} --insert 0 | ||
- name: try to authenticate to ripple Conan remote | ||
shell: bash | ||
id: remote | ||
run: | | ||
conan export external/snappy snappy/1.1.9@ | ||
conan export external/soci soci/4.0.3@ | ||
- name: install dependencies | ||
echo outcome=$(conan user --remote ripple ${{ secrets.CONAN_USERNAME }} \ | ||
--password ${{ secrets.CONAN_TOKEN }} >&2 && echo success || \ | ||
echo failure) | tee ${GITHUB_OUTPUT} | ||
- name: list missing binaries | ||
id: binaries | ||
shell: bash | ||
# Print the list of dependencies that would need to be built locally. | ||
# A non-empty list means we have "failed" to cache binaries remotely. | ||
run: | | ||
mkdir $env:build_dir | ||
cd $env:build_dir | ||
conan install .. --build missing --settings build_type=${{ matrix.configuration }} | ||
- name: configure | ||
run: | | ||
$env:build_dir | ||
cd $env:build_dir | ||
pwd | ||
ls | ||
cmake ` | ||
-G "${{ matrix.generator }}" ` | ||
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake ` | ||
-Dassert=ON ` | ||
-Dreporting=OFF ` | ||
-Dunity=OFF ` | ||
.. | ||
echo missing=$(conan info . --build missing --settings build_type=${{ matrix.configuration }} --json 2>/dev/null | grep '^\[') | tee ${GITHUB_OUTPUT} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we drive-by add the |
||
- name: build dependencies | ||
uses: ./.github/actions/dependencies | ||
with: | ||
configuration: ${{ matrix.configuration }} | ||
- name: upload dependencies to remote | ||
if: (steps.binaries.outputs.missing != '[]') && (steps.remote.outputs.outcome == 'success') | ||
run: conan upload --remote ripple '*' --all --parallel --confirm | ||
- name: build | ||
uses: ./.github/actions/build | ||
with: | ||
generator: '${{ matrix.generator }}' | ||
configuration: ${{ matrix.configuration }} | ||
# Hard code for now. Move to the matrix if varied options are needed | ||
cmake-args: '-Dassert=ON -Dreporting=OFF -Dunity=OFF' | ||
- name: test (permitted to silently fail) | ||
shell: bash | ||
# Github runners are resource limited, which causes unit tests to fail | ||
# (e.g. OOM). To allow forward progress until self-hosted runners are | ||
# up and running reliably, allow the job to succeed even if tests fail. | ||
continue-on-error: true | ||
run: | | ||
cmake --build $env:build_dir --target rippled --config ${{ matrix.configuration }} --parallel $env:NUMBER_OF_PROCESSORS | ||
- name: test | ||
run: | | ||
& "$env:build_dir\${{ matrix.configuration }}\rippled.exe" --unittest | ||
${build_dir}/${{ matrix.configuration }}/rippled --unittest --unittest-jobs $(nproc) | ||
ckeshava marked this conversation as resolved.
Show resolved
Hide resolved
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks. this change obviates the need for this PR right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh wait, I think this change affects only the windows workflow, never mind