From 87d0da2d00438c1d5cc90d389c71054dc1ee9fcf Mon Sep 17 00:00:00 2001 From: luncliff Date: Fri, 29 Sep 2023 19:45:22 +0900 Subject: [PATCH] ci: create ubuntu22, build openssl3 --- .github/workflows/build-macos.yml | 2 +- .github/workflows/build-ubuntu.yml | 43 +++++++++++++++++++++++++++++ .github/workflows/build-windows.yml | 2 +- azure-pipelines.yml | 2 +- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build-ubuntu.yml diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index ef0b29dc..562cd61c 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -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 diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml new file mode 100644 index 00000000..ac22c771 --- /dev/null +++ b/.github/workflows/build-ubuntu.yml @@ -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 }}" diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 9b9b5e2d..41017803 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b4f20139..e5b507ca 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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