Skip to content

Commit

Permalink
ci: create ubuntu22, build openssl3
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff committed Sep 29, 2023
1 parent 4982e47 commit 87d0da2
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
with:
key: "v2339-${{ runner.os }}"
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
path: |
/usr/local/share/vcpkg-downloads
/usr/local/share/vcpkg-archives
Expand Down
43 changes: 43 additions & 0 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "macOS"

on: [push, workflow_dispatch]

env:
VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"

jobs:
ubuntu22:
runs-on: "ubuntu-22.04"
strategy:
fail-fast: false
matrix:
triplet: [x64-linux]
env:
VCPKG_DOWNLOADS: "/usr/local/share/vcpkg-downloads"
VCPKG_DEFAULT_BINARY_CACHE: "/usr/local/share/vcpkg-archives"
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
steps:
- uses: actions/checkout@v3
- name: "create cache folders"
run: |
mkdir -p ${VCPKG_DOWNLOADS}
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
with:
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
path: |
/usr/local/share/vcpkg-downloads
/usr/local/share/vcpkg-archives
- uses: ConorMacBride/install-package@v1
with:
brew: ninja autoconf automake libtool
- uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2 # 2023.08.09
vcpkgJsonGlob: "test/vcpkg.json"
runVcpkgInstall: true
runVcpkgFormatString: '[`install`, `--clean-buildtrees-after-build`, `--clean-packages-after-build`, `--triplet`, `$[env.VCPKG_DEFAULT_TRIPLET]`]'
env:
VCPKG_DEFAULT_TRIPLET: "${{ matrix.triplet }}"
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
with:
key: "v2339-${{ runner.os }}"
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
path: |
C:/vcpkg/downloads
C:/vcpkg/archives
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ stages:
path: $(vcpkg.default.binary.cache)
- task: run-vcpkg@0
inputs:
vcpkgArguments: "libdispatch fft2d farmhash ruy eigen3 google-jni-bind"
vcpkgArguments: "openssl3 libdispatch fft2d farmhash ruy eigen3 google-jni-bind"
vcpkgGitCommitId: $(vcpkg.commit)
env:
VCPKG_OVERLAY_TRIPLETS: $(Build.SourcesDirectory)/triplets
Expand Down

0 comments on commit 87d0da2

Please sign in to comment.