Skip to content

Commit

Permalink
ci: remove more build jobs, test files
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff committed Nov 9, 2024
1 parent f85a284 commit ba74d7b
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 214 deletions.
94 changes: 21 additions & 73 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
# https://circleci.com/docs/2.0/configuration-reference
version: 2.1

orbs:
aws-cli: circleci/aws-cli@5.1.0 # https://circleci.com/developer/orbs/orb/circleci/aws-cli
android: circleci/android@2.5.0
orbs: # https://circleci.com/developer/orbs
aws-cli: circleci/aws-cli@5
android: circleci/android@3

workflows:
overlay:
jobs:
- x64_linux:
filters:
branches:
ignore:
- gh-pages
- docs
- arm64_android:
filters:
branches:
Expand All @@ -22,67 +16,6 @@ workflows:
- docs

jobs:
x64_linux:
machine:
image: ubuntu-2404:current
resource_class: large
environment:
VCPKG_DOWNLOADS: /tmp/vcpkg-caches
VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
steps:
- checkout
- aws-cli/setup # check project variables
- run:
name: "Setup: microsoft/vcpkg(2024.10.21)"
command: |
sudo apt-get update -y -q
sudo apt-get install -y -q curl zip unzip tar
mkdir -p $VCPKG_DOWNLOADS
mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
git clone --branch=2024.10.21 --depth=1 https://github.com/microsoft/vcpkg
pushd vcpkg
./bootstrap-vcpkg.sh
./vcpkg --version
popd
pwd
- restore_cache:
keys:
- v2445-linux-{{ checksum ".circleci/config.yml" }}
- v2445-linux-{{ .Branch }}
- v2445-linux-main
- run:
name: "Install APT packages"
command: |
sudo apt-get install -y --fix-missing \
ninja-build nasm # g++-12 libstdc++-12-dev
- run:
name: "Install: port-linux.txt"
command: |
./vcpkg install \
--keep-going --recurse \
--clean-buildtrees-after-build \
--clean-packages-after-build \
--overlay-ports "$(pwd)/../ports" \
--overlay-triplets "$(pwd)/../triplets" \
$(cat "$(pwd)/../.circleci/port-linux.txt")
environment:
VCPKG_DEFAULT_TRIPLET: x64-linux
# CC: gcc-12
# CXX: g++-12
working_directory: vcpkg
no_output_timeout: 1h
- save_cache:
key: v2445-linux-{{ .Branch }}
paths:
- /tmp/vcpkg-caches
- save_cache:
key: v2445-linux-{{ checksum ".circleci/config.yml" }}
paths:
- /tmp/vcpkg-caches
- store_artifacts:
path: vcpkg/buildtrees/
destination: "build-logs"

arm64_android:
docker: # https://circleci.com/developer/images/image/cimg/android
- image: cimg/android:2024.11.1-ndk # 28.0.12433566
Expand All @@ -93,7 +26,9 @@ jobs:
steps:
- checkout
- aws-cli/setup # check project variables
- android/accept-licenses
- android/accept_licenses
- android/change_java_version:
java_version: 17
- run:
name: "Setup: microsoft/vcpkg(2024.10.21)"
command: |
Expand All @@ -109,8 +44,13 @@ jobs:
working_directory: /tmp
environment:
VCPKG_ROOT: /tmp/vcpkg
- restore_cache:
keys:
- v2445-android-{{ checksum ".circleci/config.yml" }}
- v2445-android-{{ .Branch }}
- v2445-android-main
- run:
name: "Install: azure-port-android.txt"
name: "Install: port-android.txt"
command: |
vcpkg --version
vcpkg install \
Expand All @@ -120,12 +60,20 @@ jobs:
--clean-packages-after-build \
--overlay-ports "$(pwd)/ports" \
--overlay-triplets "$(pwd)/triplets" \
$(cat "$(pwd)/test/azure-port-android.txt")
$(cat "$(pwd)/.circleci/port-android.txt")
environment:
VCPKG_ROOT: /tmp/vcpkg
VCPKG_DEFAULT_TRIPLET: arm64-android
VCPKG_MAX_CONCURRENCY: 2
no_output_timeout: 1h
- save_cache:
key: v2445-android-{{ .Branch }}
paths:
- /tmp/vcpkg-caches
- save_cache:
key: v2445-android-{{ checksum ".circleci/config.yml" }}
paths:
- /tmp/vcpkg-caches
- store_artifacts:
path: buildtrees/ # follow --x-buildtrees-root
destination: "build-logs"
File renamed without changes.
7 changes: 0 additions & 7 deletions .circleci/port-linux.txt

This file was deleted.

4 changes: 0 additions & 4 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.08.23"
vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
fail-fast: false
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.08.23"
vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
fail-fast: false
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.08.23"
vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
fail-fast: false
Expand Down
115 changes: 4 additions & 111 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ variables:
- name: vcpkg.version
value: "2024.10.21"

- name: vcpkg.overlay.ports # == VCPKG_OVERLAY_PORTS
- name: vcpkg.overlay.ports # VCPKG_OVERLAY_PORTS
value: $(Build.SourcesDirectory)/ports # --overlay-ports $(Build.SourcesDirectory)/ports
- name: vcpkg.overlay.triplets # VCPKG_OVERLAY_TRIPLETS
value: $(Build.SourcesDirectory)/triplets # --overlay-triplets $(Build.SourcesDirectory)/triplets
Expand All @@ -37,7 +37,7 @@ variables:
- name: AzureSource
value: "x-azblob,https://$(az-storage).blob.core.windows.net/$(az-container),$(az-sas),readwrite"
- name: vcpkg.binary.sources # VCPKG_BINARY_SOURCES
value: "default;$(AzureSource)"
value: "default" # $(AzureSource)
- name: vcpkg.default.binary.cache
value: $(Build.ArtifactStagingDirectory)/vcpkg-archives

Expand All @@ -55,8 +55,6 @@ stages:
value: "C:/vcpkg" # VCPKG_INSTALLATION_ROOT
strategy:
matrix:
arm64_windows:
vcpkg.default.triplet: "arm64-windows"
arm64_uwp:
vcpkg.default.triplet: "arm64-uwp"
steps:
Expand All @@ -67,14 +65,6 @@ stages:
restoreKeys: |
"v2445-bin-uwp" | "$(vcpkg.default.triplet)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: arm64-windows"
inputs:
script: |
$Ports=$(Get-Content "test/azure-port-arm64-windows.txt")
vcpkg install --keep-going $Ports --clean-buildtrees-after-build --clean-packages-after-build
targetType: 'inline'
condition: ne(variables['vcpkg.default.triplet'], 'arm64-uwp')
- task: PowerShell@2
displayName: "Test: arm64-uwp"
inputs:
Expand Down Expand Up @@ -109,7 +99,7 @@ stages:
- name: vcpkg.root
value: "/usr/local/share/vcpkg" # VCPKG_INSTALLATION_ROOT
strategy:
matrix: # ubuntu-latest
matrix:
x64_clang15:
vcpkg.default.triplet: "x64-linux"
cc: clang-15
Expand Down Expand Up @@ -149,114 +139,17 @@ stages:
ArtifactName: "$(Agent.JobName)"
condition: always()

- job: "port_android"
displayName: "Android"
pool:
vmImage: ubuntu-latest
variables:
- name: vcpkg.root
value: "/usr/local/share/vcpkg" # VCPKG_INSTALLATION_ROOT
strategy:
matrix: # https://github.com/android/ndk/releases
arm64_ndk27:
vcpkg.default.triplet: "arm64-android"
x64_ndk27:
vcpkg.default.triplet: "x64-android"
steps:
- powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
- task: Cache@2
inputs:
key: '"v2445-bin-android" | "$(vcpkg.default.triplet)"'
restoreKeys: |
"v2445-bin-android" | "$(vcpkg.default.triplet)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: $(vcpkg.default.triplet)"
inputs:
script: |
$Ports=$(Get-Content "test/azure-port-android.txt")
vcpkg install --keep-going $Ports --clean-buildtrees-after-build --clean-packages-after-build
targetType: 'inline'
- task: CopyFiles@2
inputs:
SourceFolder: "$(vcpkg.root)/buildtrees/"
Contents: |
**/?(*.log|*.txt|*.cmake)
TargetFolder: "$(Build.ArtifactStagingDirectory)/log"
OverWrite: true
condition: always()
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: "$(Build.ArtifactStagingDirectory)/log"
ArtifactName: "$(Agent.JobName)"
condition: always()

- stage: "Apple"
dependsOn: []
jobs:
- job: "port_osx"
displayName: "Mac"
timeoutInMinutes: "200"
pool:
vmImage: macos-latest
variables:
- name: vcpkg.root
value: "/usr/local/share/vcpkg"
strategy:
matrix:
arm64_osx:
vcpkg.default.triplet: "arm64-osx"
x64_osx:
vcpkg.default.triplet: "x64-osx"
steps:
- powershell: brew install vcpkg $(Get-Content test/packages-homebrew.txt)
displayName: "Install HomeBrew packages"
- powershell: pip install typing-extensions pybind11 numpy pyyaml
displayName: "Install Python packages"
- task: PowerShell@2
displayName: "Setup vcpkg"
inputs:
script: |
New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
Push-Location /usr/local/share/
git clone --branch "$env:VCPKG_VERSION" --depth 1 https://github.com/microsoft/vcpkg
Pop-Location
targetType: 'inline'
- task: Cache@2
inputs:
key: '"v2445-bin-osx" | "$(vcpkg.default.triplet)"'
restoreKeys: |
"v2445-bin-osx" | "$(vcpkg.default.triplet)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: osx"
inputs:
script: |
$Ports=$(Get-Content "test/azure-port-osx.txt")
vcpkg install --keep-going $Ports --clean-buildtrees-after-build --clean-packages-after-build
targetType: 'inline'
- task: CopyFiles@2
inputs:
SourceFolder: "$(vcpkg.root)/buildtrees/"
Contents: |
**/?(*.log|*.txt|*.cmake)
TargetFolder: "$(Build.ArtifactStagingDirectory)/log"
OverWrite: true
condition: always()
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: "$(Build.ArtifactStagingDirectory)/log"
ArtifactName: "$(Agent.JobName)"
condition: always()

- job: "port_ios"
displayName: "iOS"
timeoutInMinutes: "200"
pool:
vmImage: macos-latest
variables:
- name: vcpkg.root
value: "/usr/local/share/vcpkg"
value: "/usr/local/share/vcpkg" # VCPKG_INSTALLATION_ROOT
strategy:
matrix:
arm64_ios:
Expand Down
4 changes: 0 additions & 4 deletions test/azure-port-arm64-windows.txt

This file was deleted.

1 change: 0 additions & 1 deletion test/azure-port-osx-host.txt

This file was deleted.

5 changes: 0 additions & 5 deletions test/azure-port-osx.txt

This file was deleted.

1 change: 0 additions & 1 deletion test/azure-triplet-ios.txt

This file was deleted.

0 comments on commit ba74d7b

Please sign in to comment.