Skip to content

Commit 83a45b0

Browse files
committed
Update CI to use windows-2022, and linux builds to use apt
Signed-off-by: Michael Dolan <[email protected]>
1 parent 3891c98 commit 83a45b0

File tree

6 files changed

+13
-19
lines changed

6 files changed

+13
-19
lines changed

.github/workflows/analysis_workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
- name: Install sonar-scanner and build-wrapper
4848
uses: sonarsource/sonarcloud-github-c-cpp@v2
4949
- name: Install docs env
50-
run: share/ci/scripts/linux/yum/install_docs_env.sh
50+
run: share/ci/scripts/linux/apt/install_docs_env.sh
5151
- name: Install tests env
52-
run: share/ci/scripts/linux/yum/install_tests_env.sh
52+
run: share/ci/scripts/linux/apt/install_tests_env.sh
5353
- name: Create build directories
5454
run: |
5555
mkdir _install

.github/workflows/ci_workflow.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ jobs:
154154
- name: Checkout
155155
uses: actions/checkout@v4
156156
- name: Install docs env
157-
run: share/ci/scripts/linux/yum/install_docs_env.sh
157+
run: share/ci/scripts/linux/apt/install_docs_env.sh
158158
if: matrix.build-docs == 'ON'
159159
- name: Install tests env
160-
run: share/ci/scripts/linux/yum/install_tests_env.sh
160+
run: share/ci/scripts/linux/apt/install_tests_env.sh
161161
- name: Create build directories
162162
run: |
163163
mkdir _install
@@ -366,10 +366,10 @@ jobs:
366366
- name: Checkout
367367
uses: actions/checkout@v3
368368
- name: Install docs env
369-
run: share/ci/scripts/linux/yum/install_docs_env.sh
369+
run: share/ci/scripts/linux/apt/install_docs_env.sh
370370
if: matrix.build-docs == 'ON'
371371
- name: Install tests env
372-
run: share/ci/scripts/linux/yum/install_tests_env.sh
372+
run: share/ci/scripts/linux/apt/install_tests_env.sh
373373
- name: Create build directories
374374
run: |
375375
mkdir _install
@@ -736,7 +736,7 @@ jobs:
736736
# Debug build testing with Python bindings and docs enabled.
737737

738738
windows:
739-
name: 'Windows 2019
739+
name: 'Windows 2022
740740
<MSVC
741741
config=${{ matrix.build-type }},
742742
shared=${{ matrix.build-shared }},
@@ -749,7 +749,7 @@ jobs:
749749
if: |
750750
github.event_name == 'push' ||
751751
github.event.pull_request.head.repo.full_name != github.repository
752-
runs-on: windows-2019
752+
runs-on: windows-2022
753753
strategy:
754754
matrix:
755755
build: [1, 2, 3, 4]

.github/workflows/dependencies_latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ jobs:
9292
- name: Checkout
9393
uses: actions/checkout@v3
9494
- name: Install docs env
95-
run: share/ci/scripts/linux/yum/install_docs_env.sh
95+
run: share/ci/scripts/linux/apt/install_docs_env.sh
9696
if: matrix.build-docs == 'ON'
9797
- name: Install tests env
98-
run: share/ci/scripts/linux/yum/install_tests_env.sh
98+
run: share/ci/scripts/linux/apt/install_tests_env.sh
9999
- name: Setup ext environment
100100
run: |
101101
EXT_PATH=/usr/local

.github/workflows/platform_latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Checkout
8989
uses: actions/checkout@v4
9090
- name: Install tests env
91-
run: share/ci/scripts/linux/yum/install_tests_env.sh
91+
run: share/ci/scripts/linux/apt/install_tests_env.sh
9292
- name: Create build directories
9393
run: |
9494
mkdir _install

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test-command = [
2727
]
2828

2929
[tool.cibuildwheel.linux]
30-
before-build = "share/ci/scripts/linux/yum/install_docs_env.sh"
30+
before-build = "share/ci/scripts/linux/apt/install_docs_env.sh"
3131

3232
[tool.cibuildwheel.macos]
3333
# cibuildwheel in some cases set this to 10.9 by default, OCIO needs >= 10.13

share/ci/scripts/linux/yum/install_docs_env.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,5 @@ set -ex
66

77
HERE=$(dirname $0)
88

9-
# The yum install doxygen command started failing during CI since mirrorlist.centos.org
10-
# was turned off. However, it seems that Doxygen is already installed on the containers
11-
# used for CI, so this command is not currently necessary there. You will need to
12-
# uncomment this line if you want to build the documentation on Linux but don't have
13-
# doxygen already installed.
14-
# bash $HERE/install_doxygen.sh latest
15-
9+
bash $HERE/install_doxygen.sh latest
1610
pip install -r $HERE/../../../../../docs/requirements.txt

0 commit comments

Comments
 (0)