Skip to content
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

Branch 8.8: Use vcpkg #2549

Merged
merged 53 commits into from
Jan 6, 2025
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
16bbe71
add vcpkg json and triplet
payetvin Dec 26, 2024
943422e
ubuntu job
payetvin Dec 26, 2024
d40fd98
Merge branch 'release/8.8.x' into feature/8.8-vcpkg
payetvin Dec 26, 2024
6a39a74
add ports, fix cmake error
payetvin Dec 26, 2024
bee276a
remove antares deps in main cmakelists, try fix wxwidgets
payetvin Dec 26, 2024
eef6444
fix parenthesis
payetvin Dec 26, 2024
0e11e62
remove old vcpkg cache ubuntu
payetvin Dec 26, 2024
3ad2886
sonarcloud jojb
payetvin Dec 26, 2024
28ef39c
remove antares deps from download precompiled job
payetvin Dec 27, 2024
60ee0ef
windows job
payetvin Dec 27, 2024
cf69f63
dowload zip action
payetvin Dec 27, 2024
9e86f87
indent windows vcpkg
payetvin Dec 27, 2024
caff47f
windows
payetvin Dec 27, 2024
6524892
use windows-vcpkg from develop
payetvin Dec 27, 2024
1f21186
fix windows job
payetvin Dec 27, 2024
77338c0
try previous boost version
payetvin Dec 27, 2024
d0a1290
revert boost versin
payetvin Dec 27, 2024
c70d9bb
use boost 1.72
payetvin Dec 27, 2024
54bbfc9
revert boost
payetvin Dec 27, 2024
34eded9
remove antares deps from git modules
payetvin Dec 27, 2024
7fe3bee
ubuntu job
payetvin Dec 27, 2024
61013c1
remove deps from download extract
payetvin Dec 27, 2024
6f7dc09
boost test version 1.81
payetvin Dec 27, 2024
a7419a5
change cache key
payetvin Dec 27, 2024
7512210
remove vcpkg package from windows job
payetvin Dec 27, 2024
b861de4
revert last commit
payetvin Dec 27, 2024
1b48ab2
use develop ubuntu.yml
payetvin Dec 30, 2024
b16a593
use develop centos and oracle 8
payetvin Dec 30, 2024
e7cedb8
activate centos and oracle jobs on this branch
payetvin Dec 30, 2024
64e785c
solver-8.8 for oracle
payetvin Dec 30, 2024
aefa052
solver-8.8 for windows and ubuntu
payetvin Dec 30, 2024
00306cf
add docker/ from develop
payetvin Dec 30, 2024
f47de12
remove api tests
payetvin Dec 30, 2024
ac8d763
update action version, cmake action
payetvin Dec 30, 2024
be64019
remove init test nr from ubuntu
payetvin Dec 30, 2024
f56f1bc
solver 8-8 for centos in dockerfile
payetvin Dec 30, 2024
bae030d
rm tests related to ts generator exe
payetvin Dec 30, 2024
133f602
type in centos dockerfile
payetvin Dec 30, 2024
64c7b76
centos and oracle8 OK
payetvin Dec 30, 2024
4bee611
sonarcloud versions
payetvin Dec 30, 2024
73bd1dc
use same vcpkg version
payetvin Dec 30, 2024
66617f0
remove 9.1 9.2 tests in windows
payetvin Dec 30, 2024
4a4e919
remove test nr init
payetvin Dec 30, 2024
3fba2e4
Merge, fix conflicts in CI files
payetvin Jan 6, 2025
9d2c018
checkout vcpkg to b322364f, update vcpkg.json
payetvin Jan 6, 2025
5298ef2
update new_release.yml
payetvin Jan 6, 2025
14256a7
remove antares-deps-version.json
payetvin Jan 6, 2025
5863bff
update build-userguide
payetvin Jan 6, 2025
0d01065
rc4
payetvin Jan 6, 2025
32602f6
remove cucumber tests
payetvin Jan 6, 2025
aecd5a8
remove antares-deps directory
payetvin Jan 6, 2025
691807b
simtest 8.8.12
payetvin Jan 6, 2025
1e08c60
Change error message for sirius not found
payetvin Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
windows job
  • Loading branch information
payetvin committed Dec 27, 2024
commit 60ee0ef104b9343593a76745815a1b540a037561
56 changes: 18 additions & 38 deletions .github/workflows/windows-vcpkg.yml
Original file line number Diff line number Diff line change
@@ -78,45 +78,22 @@ jobs:
key: windows

- name : Init VCPKG submodule
run: |
git submodule update --init vcpkg

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v4
with:
# The first path is the location of vcpkg (it contains the vcpkg executable and data files).
# The other paths starting with '!' are exclusions: they contain temporary files generated during the build of the installed packages.
path: |
${{ env.VCPKG_ROOT }}
!${{ env.VCPKG_ROOT }}/buildtrees
!${{ env.VCPKG_ROOT }}/packages
!${{ env.VCPKG_ROOT }}/downloads
# The key is composed in a way that it gets properly invalidated: this must happen whenever vcpkg's Git commit id changes, or the list of packages changes. In this case a cache miss must happen and a new entry with a new key with be pushed to GitHub the cache service.
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
key: |
${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }}

- name : Install deps with VCPKG
run: |
cd vcpkg
./bootstrap-vcpkg.sh
vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}}
rm -rf buildtrees packages downloads
shell: bash
run: |
git submodule update --init vcpkg && ./vcpkg/bootstrap-vcpkg.bat -disableMetrics

- name: Read antares-deps version
id: antares-deps-version
uses: notiz-dev/github-action-json-property@release
- name: Restore vcpkg binary dir from cache
id: cache-vcpkg-binary
uses: actions/cache/restore@v4
with:
path: 'antares-deps-version.json'
prop_path: 'antares_deps_version'
path: ${{ github.workspace }}/vcpkg_cache
key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
# Allows to restore a cache when deps have only partially changed (like adding a dependency)
restore-keys: vcpkg-cache-windows-

- name: Download pre-compiled librairies
uses: ./.github/workflows/download-extract-precompiled-libraries-zip
with:
antares-deps-version: ${{steps.antares-deps-version.outputs.prop}}
os: ${{env.os}}
ortools-url: ${{env.ORTOOLS_URL}}
ortools-dir: ${{env.ORTOOLS_DIR}}
@@ -131,22 +108,17 @@ jobs:
- name: Install pip dependencies if necessary
run: pip install -r src/tests/examples/requirements.txt

- name: Init submodule
run: |
git submodule update --init src/antares-deps
git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests

- name: Enable git longpaths
run: git config --system core.longpaths true

- name: Configure
shell: bash
run: |
cmake -B _build -S src \
-DDEPS_INSTALL_DIR=rte-antares-deps-Release \
-DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \
-DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \
-DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_TESTING=ON \
-DBUILD_TOOLS=ON \
@@ -324,3 +296,11 @@ jobs:
run: |
gh release upload "$tag" _build/*.zip _build/*.exe
shell: bash

- name: Cache vcpkg binary dir
if: always()
id: save-cache-vcpkg-binary
uses: actions/cache/save@v4
with:
path: ${{ github.workspace }}/vcpkg_cache
key: vcpkg-cache-windows-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
Loading