Skip to content

Commit d17d9e2

Browse files
authored
CI update for 2024 3Q releases (#229)
* Test feature: `vulkan` * Deprecate check with vcpkg 2024.04.26 * Test Android build in CircleCI * Remove Triplet test in Azure Pipelines * ci: exclude onnxruntime arm64-windows * disable VCPKG_ENABLE_METRICS, cache only VCPKG_DOWNLOADS * change vcpkg.json, self-hosted.json
1 parent 18acf49 commit d17d9e2

9 files changed

+285
-226
lines changed

.circleci/config.yml

+57-19
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,49 @@
22
version: 2.1
33

44
orbs:
5-
# win: circleci/[email protected]
6-
aws-cli: circleci/[email protected] # https://circleci.com/developer/orbs/orb/circleci/aws-cli
7-
aws-s3: circleci/[email protected]
5+
aws-cli: circleci/[email protected] # https://circleci.com/developer/orbs/orb/circleci/aws-cli
6+
android: circleci/[email protected]
87

98
workflows:
109
overlay:
1110
jobs:
12-
- x64_linux_gcc:
11+
- x64_linux:
1312
filters:
1413
branches:
1514
ignore:
1615
- gh-pages
1716
- docs
17+
- arm64_android
1818

1919
jobs:
20-
x64_linux_gcc:
21-
# docker:
22-
# - image: gcc:13.2
20+
x64_linux:
2321
machine:
2422
image: ubuntu-2204:current
2523
resource_class: large
2624
environment:
2725
VCPKG_DOWNLOADS: /tmp/vcpkg-caches
2826
VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
29-
VCPKG_DEFAULT_TRIPLET: x64-linux
3027
steps:
3128
- checkout
32-
- aws-cli/setup
29+
- aws-cli/setup # check project variables
3330
- run:
34-
name: "Setup: microsoft/vcpkg(2024.05.24)"
31+
name: "Setup: microsoft/vcpkg(2024.07.12)"
3532
command: |
3633
sudo apt-get update -y -q
3734
sudo apt-get install -y -q curl zip unzip tar
3835
mkdir -p $VCPKG_DOWNLOADS
3936
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
40-
git clone --branch=2024.05.24 --depth=1 https://github.com/microsoft/vcpkg
37+
git clone --branch=2024.07.12 --depth=1 https://github.com/microsoft/vcpkg
4138
pushd vcpkg
4239
./bootstrap-vcpkg.sh
4340
./vcpkg --version
4441
popd
4542
pwd
4643
- restore_cache:
4744
keys:
48-
- v2430-linux-{{ checksum ".circleci/config.yml" }}
49-
- v2430-linux-{{ .Branch }}
50-
- v2430-linux-main
45+
- v2432-linux-{{ checksum ".circleci/config.yml" }}
46+
- v2432-linux-{{ .Branch }}
47+
- v2432-linux-main
5148
- run:
5249
name: "Install APT packages"
5350
command: |
@@ -62,19 +59,60 @@ jobs:
6259
--clean-packages-after-build \
6360
--overlay-ports "$(pwd)/../ports" \
6461
$(cat "$(pwd)/../.circleci/port-linux.txt")
65-
# environment:
66-
# CC: gcc-12
67-
# CXX: g++-12
62+
environment:
63+
VCPKG_DEFAULT_TRIPLET: x64-linux
64+
# CC: gcc-12
65+
# CXX: g++-12
6866
working_directory: vcpkg
6967
no_output_timeout: 1h
7068
- save_cache:
71-
key: v2430-linux-{{ .Branch }}
69+
key: v2432-linux-{{ .Branch }}
7270
paths:
7371
- /tmp/vcpkg-caches
7472
- save_cache:
75-
key: v2430-linux-{{ checksum ".circleci/config.yml" }}
73+
key: v2432-linux-{{ checksum ".circleci/config.yml" }}
7674
paths:
7775
- /tmp/vcpkg-caches
7876
- store_artifacts:
7977
path: vcpkg/buildtrees/
8078
destination: "build-logs"
79+
80+
arm64_android:
81+
docker:
82+
- image: cimg/android:2024.08.1-ndk
83+
environment:
84+
VCPKG_DOWNLOADS: /tmp/vcpkg-caches
85+
VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
86+
steps:
87+
- checkout
88+
- aws-cli/setup # check project variables
89+
- android/accept-licenses
90+
- run:
91+
name: "Setup: microsoft/vcpkg(2024.07.12)"
92+
command: |
93+
sudo apt-get update -y -q
94+
sudo apt-get install -y -q curl zip unzip tar
95+
mkdir -p $VCPKG_DOWNLOADS
96+
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
97+
git clone --branch=2024.07.12 --depth=1 https://github.com/microsoft/vcpkg
98+
pushd vcpkg
99+
./bootstrap-vcpkg.sh
100+
./vcpkg --version
101+
popd
102+
pwd
103+
- run:
104+
name: "Install: azure-port-android.txt"
105+
command: |
106+
./vcpkg install \
107+
--keep-going --recurse \
108+
--clean-buildtrees-after-build \
109+
--clean-packages-after-build \
110+
--overlay-ports "$(pwd)/../ports" \
111+
--overlay-ports "$(pwd)/../triplets" \
112+
$(cat "$(pwd)/../test/azure-port-android.txt")
113+
working_directory: vcpkg
114+
environment:
115+
VCPKG_DEFAULT_TRIPLET: arm64-android
116+
- store_artifacts:
117+
path: vcpkg/buildtrees/
118+
destination: "build-logs"

.github/workflows/build-macos.yml

+25-19
Original file line numberDiff line numberDiff line change
@@ -7,66 +7,72 @@ concurrency:
77
cancel-in-progress: true
88

99
env:
10-
VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
10+
VCPKG_ENABLE_METRICS: 0
1111

1212
jobs:
1313
overlay:
1414
runs-on: "macos-13"
1515
strategy:
1616
matrix:
1717
include:
18-
- vcpkg_tag: "2024.04.26"
19-
vcpkg_commit: "943c5ef1c8f6b5e6ced092b242c8299caae2ff01"
2018
- vcpkg_tag: "2024.05.24"
2119
vcpkg_commit: "01f602195983451bc83e72f4214af2cbc495aa94"
2220
- vcpkg_tag: "2024.06.15"
2321
vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
22+
- vcpkg_tag: "2024.07.12"
23+
vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
2424
fail-fast: false
2525
env:
26-
VCPKG_DOWNLOADS: "/usr/local/share/vcpkg-downloads"
27-
VCPKG_DEFAULT_BINARY_CACHE: "/usr/local/share/vcpkg-archives"
26+
VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
2827
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
2928
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
3029
steps:
3130
- uses: actions/[email protected]
3231
- uses: ConorMacBride/[email protected]
3332
with:
34-
brew: ninja autoconf automake libtool
33+
brew: autoconf automake libtool
3534

36-
# - uses: mobiledevops/[email protected]
37-
# with:
38-
# xcode-select-version: "15.2"
39-
40-
- name: "create cache folders"
41-
run: |
42-
mkdir -p ${VCPKG_DOWNLOADS}
43-
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
35+
- uses: mobiledevops/[email protected]
36+
with:
37+
xcode-select-version: "15.2"
4438

4539
- uses: actions/[email protected]
4640
with:
47-
key: "v2426-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
41+
key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
4842
path: |
49-
/usr/local/share/vcpkg-downloads
50-
/usr/local/share/vcpkg-archives
43+
${{ runner.temp }}/vcpkg-downloads
44+
45+
- name: "Create cache folders"
46+
shell: bash
47+
run: |
48+
mkdir -p ${VCPKG_DOWNLOADS}
49+
env:
50+
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
5151

5252
- uses: lukka/[email protected]
53+
name: "Run vcpkg(x64-osx)"
5354
with:
5455
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
5556
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
5657
vcpkgJsonGlob: "test/vcpkg.json"
58+
vcpkgConfigurationJsonGlob: "test/vcpkg-configuration.json"
5759
runVcpkgInstall: true
58-
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`]'
60+
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `test`]'
5961
env:
6062
VCPKG_DEFAULT_TRIPLET: "x64-osx"
6163
VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
64+
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
6265

6366
- uses: lukka/[email protected]
67+
name: "Run vcpkg(arm64-osx)"
6468
with:
6569
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
6670
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
6771
vcpkgJsonGlob: "test/vcpkg.json"
72+
vcpkgConfigurationJsonGlob: "test/vcpkg-configuration.json"
6873
runVcpkgInstall: true
69-
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`]'
74+
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `test`]'
7075
env:
7176
VCPKG_DEFAULT_TRIPLET: "arm64-osx"
7277
VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
78+
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"

.github/workflows/build-ubuntu.yml

+30-16
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ concurrency:
77
cancel-in-progress: true
88

99
env:
10-
VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
10+
VCPKG_ENABLE_METRICS: 0
1111

1212
jobs:
1313
overlay:
14-
# check https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
15-
runs-on: "ubuntu-22.04"
14+
runs-on: "ubuntu-latest" # check https://github.com/actions/runner-images/blob/main/images/ubuntu
1615
strategy:
1716
matrix:
1817
include:
19-
- vcpkg_tag: "2024.04.26"
20-
vcpkg_commit: "943c5ef1c8f6b5e6ced092b242c8299caae2ff01"
2118
- vcpkg_tag: "2024.05.24"
2219
vcpkg_commit: "01f602195983451bc83e72f4214af2cbc495aa94"
2320
- vcpkg_tag: "2024.06.15"
2421
vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
22+
- vcpkg_tag: "2024.07.12"
23+
vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
2524
fail-fast: false
2625
env:
26+
VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
2727
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
2828
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
2929
steps:
@@ -32,30 +32,44 @@ jobs:
3232
with:
3333
apt: nuget nasm libnuma-dev libopenmpi-dev libx11-dev libxi-dev libxext-dev libx11-xcb-dev
3434

35-
- name: "create cache folders"
35+
- uses: actions/[email protected]
36+
with:
37+
key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
38+
path: |
39+
${{ runner.temp }}/vcpkg-downloads
40+
41+
- name: "Create cache folders"
42+
shell: bash
3643
run: |
3744
mkdir -p ${VCPKG_DOWNLOADS}
38-
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
3945
env:
4046
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
41-
VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives"
4247

43-
- uses: actions/[email protected]
48+
- uses: lukka/[email protected]
49+
name: "Run vcpkg(x64-linux)"
4450
with:
45-
key: "v2426-x64-linux-${{ matrix.vcpkg_tag }}"
46-
path: |
47-
${{ runner.temp }}/vcpkg-downloads
48-
${{ runner.temp }}/vcpkg-archives
51+
vcpkgDirectory: "${{ runner.temp }}/vcpkg" # ignore VCPKG_INSTALLATION_ROOT
52+
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
53+
vcpkgJsonGlob: "test/vcpkg.json"
54+
vcpkgConfigurationJsonGlob: "test/vcpkg-configuration.json"
55+
runVcpkgInstall: true
56+
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `test`]'
57+
env:
58+
VCPKG_DEFAULT_TRIPLET: "x64-linux"
59+
VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
60+
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
4961

5062
- uses: lukka/[email protected]
63+
name: "Run vcpkg(arm64-linux)" # It's for future works. Not ready yet...
64+
if: ${{ false }}
5165
with:
5266
vcpkgDirectory: "${{ runner.temp }}/vcpkg" # ignore VCPKG_INSTALLATION_ROOT
5367
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
5468
vcpkgJsonGlob: "test/vcpkg.json"
69+
vcpkgConfigurationJsonGlob: "test/vcpkg-configuration.json"
5570
runVcpkgInstall: true
56-
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`]'
71+
runVcpkgFormatString: '[`install`, `--keep-going`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`, `--x-feature`, `test`]'
5772
env:
58-
VCPKG_DEFAULT_TRIPLET: "x64-linux"
73+
VCPKG_DEFAULT_TRIPLET: "arm64-linux"
5974
VCPKG_BINARY_SOURCES: ${{ secrets.VCPKG_BINARY_SOURCES }}
6075
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
61-
VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives"

0 commit comments

Comments
 (0)