Squashed 'src/3rdParty/libE57Format/' changes from d51a32d6ab7..d885ae35147
d885ae35147 {doc} Update CHANGELOG for 3.3.0
9e7c0a25e4c {cmake} Update version to 3.3.0
8b668f19380 {doc} Update CHANGELOG
dcdda358b0f {doc} Add MicMac to README
5fb956155c7 Replace codecvt_utf8_utf16(deprecatred in C++17) with WIN32 API if C++>=17
a99cbb9ac82 {ci} Update actions/checkout to v5
23a37530095 {ci} Fix CI warnings
04a913cc35e {ci, doc} Fix clang -documentation warnings (#327)
7e3079b9a35 {ci} Make Windows CI working again (#325)
bab1d8b2350 {doc} Update CHANGELOG
git-subtree-dir: src/3rdParty/libE57Format
git-subtree-split: d885ae35147dabd0ad9f6a85e46538b27b1b701c
This commit is contained in:
9
.github/workflows/build.yml
vendored
9
.github/workflows/build.yml
vendored
@@ -92,12 +92,12 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v5
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Checkout Test Data
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v5
|
||||
with:
|
||||
repository: 'asmaloney/libE57Format-test-data'
|
||||
path: libE57Format-test-data
|
||||
@@ -105,7 +105,7 @@ jobs:
|
||||
- name: Install Dependencies (macOS)
|
||||
if: matrix.platform == 'macos'
|
||||
run: |
|
||||
brew install ccache ninja xerces-c
|
||||
brew install ccache xerces-c
|
||||
|
||||
- name: Install Dependencies (Linux)
|
||||
if: matrix.platform == 'linux'
|
||||
@@ -118,13 +118,14 @@ jobs:
|
||||
if: matrix.platform == 'windows'
|
||||
uses: conda-incubator/setup-miniconda@v3
|
||||
with:
|
||||
channels: conda-forge
|
||||
channels: conda-forge,defaults
|
||||
|
||||
- name: Install More Dependencies (Windows)
|
||||
if: matrix.platform == 'windows'
|
||||
shell: bash -el {0}
|
||||
run: |
|
||||
conda install conda-forge::xerces-c
|
||||
echo "CMAKE_PREFIX_PATH=${CONDA_PREFIX}/Library" >> "$GITHUB_ENV"
|
||||
choco upgrade ccache ninja
|
||||
ccache --version | head -n 1
|
||||
echo "ninja $(ninja --version)"
|
||||
|
||||
Reference in New Issue
Block a user