Skip to content

Commit

Permalink
ci: overhaul for end of 2023
Browse files Browse the repository at this point in the history
* azure-pipelines: remove Windows jobs
* gh-actions: update test manifests
* gh-actions: update versions of applications
* readme: update to later vcpkg release
  • Loading branch information
luncliff committed Dec 19, 2023
1 parent 9908695 commit e301341
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 157 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ jobs:
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1
- name: "create cache folders"
run: |
mkdir -p ${VCPKG_DOWNLOADS}
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
- uses: actions/cache@v3.3.2
with:
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2351-${{ runner.os }}-${{ matrix.triplet }}"
path: |
/usr/local/share/vcpkg-downloads
/usr/local/share/vcpkg-archives
- uses: ConorMacBride/install-package@v1
- uses: ConorMacBride/install-package@v1.1.0
with:
brew: ninja autoconf automake libtool
- uses: lukka/run-vcpkg@v11
- uses: lukka/run-vcpkg@v11.3
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
vcpkgGitCommitId: "a42af01b72c28a8e1d7b48107b33e4f286a55ef6" # 2023.11.20
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ jobs:
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.1
- name: "create cache folders"
run: |
mkdir -p ${VCPKG_DOWNLOADS}
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
env:
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives"
- uses: actions/cache@v3
- uses: actions/cache@v3.3.2
with:
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2351-${{ runner.os }}-${{ matrix.triplet }}"
path: |
${{ runner.temp }}/vcpkg-downloads
${{ runner.temp }}/vcpkg-archives
- uses: ConorMacBride/install-package@v1
- uses: ConorMacBride/install-package@v1.1.0
with:
apt: nuget nasm libnuma-dev libopenmpi-dev libx11-dev libxi-dev libxext-dev libx11-xcb-dev
- uses: lukka/run-vcpkg@v11
- uses: lukka/run-vcpkg@v11.3
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
doNotUpdateVcpkg: true
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
run: |
New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS}
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
- uses: actions/cache@v3.3.2
with:
key: "v2339-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2351-${{ runner.os }}-${{ matrix.triplet }}"
path: |
C:/vcpkg/downloads
C:/vcpkg/archives
- uses: microsoft/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
with:
msbuild-architecture: x64
- uses: lukka/[email protected]
Expand All @@ -44,7 +44,7 @@ jobs:
cuda_x64:
runs-on: ["self-hosted", "Windows", "CUDA"]
continue-on-error: true
timeout-minutes: 60
timeout-minutes: 180
env:
VCPKG_DOWNLOADS: "C:/vcpkg/downloads"
VCPKG_DEFAULT_BINARY_CACHE: "C:/vcpkg/archives"
Expand All @@ -57,7 +57,7 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS}
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
Move-Item -Path "test/self-hosted-cuda.json" -Destination "test/vcpkg.json" -Force
- uses: microsoft/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
with:
msbuild-architecture: x64
- uses: lukka/[email protected]
Expand All @@ -70,6 +70,6 @@ jobs:
env:
VCPKG_DEFAULT_TRIPLET: "x64-windows"

- uses: yumis-coconudge/clean-workspace-action@v1
- uses: yumis-coconudge/clean-workspace-action@v1.0.5
with:
additional-path: "C:/vcpkg/installed"
10 changes: 5 additions & 5 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4.1.1
- uses: actions/setup-python@v5.0.0
with:
python-version: 3.11
architecture: x64
Expand All @@ -35,8 +35,8 @@ jobs:
run: >
python3 -m mkdocs build --site-dir _site
- uses: actions/configure-pages@v3
- uses: actions/upload-pages-artifact@v2
- uses: actions/configure-pages@v4.0.0
- uses: actions/upload-pages-artifact@v3.0.0
with:
path: '_site'
- uses: actions/deploy-pages@v2
- uses: actions/deploy-pages@v4.0.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Targets...

* [vcpkg](https://github.com/microsoft/vcpkg): recommend [2023.06.20](https://github.com/microsoft/vcpkg/releases/tag/2023.06.20) or later
* [vcpkg](https://github.com/microsoft/vcpkg): recommend [2023.10.19](https://github.com/microsoft/vcpkg/releases/tag/2023.10.19) or later
* [vcpkg-tool](https://github.com/microsoft/vcpkg-tool) follows the vcpkg

### References
Expand Down
Loading

0 comments on commit e301341

Please sign in to comment.