Skip to content

Commit

Permalink
Cover vs2022 in documentation and example files
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphlange authored and mdavidsaver committed Jan 18, 2022
1 parent e065445 commit f7e21c7
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 14 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ levels as the example files.
the module can be patched or further configured.

- Define shared (default) or static builds (for executables and libraries).

- Define optimized (default) or debug builds.

- Run tests (using the EPICS build system, i.e., `make runtests`
Expand All @@ -76,7 +76,7 @@ and limitations.
- Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
- Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
- Built dependencies are cached (for faster builds).

See specific
**[ci-scripts on Travis-CI README](travis/README.md)**
for more details.
Expand All @@ -85,7 +85,7 @@ for more details.
- One parallel runner (all builds are sequential)
- Windows Server 2012/2016/2019
- Compile using gcc/MinGW or different Visual Studio versions: \
2010, 2012, 2013, 2015, 2017, 2019
2010, 2012, 2013, 2015, 2017, 2019, 2022
- Compile for Windows 32bit and 64bit
- No useful caching available.

Expand All @@ -95,10 +95,10 @@ for more details.

### [GitHub Actions](https://github.com/)
- 20 parallel runners on Linux/Windows (5 runners on MacOS)
- Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
- Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019/2022
- Compile natively on Linux (gcc, clang)
- Compile natively on MacOS (clang)
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017/2019/2022)
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
- Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
- Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
Expand All @@ -112,7 +112,7 @@ for more details.

- Docker-based runners on Linux (one VM instance per job)
- Can use any Docker image from Dockerhub (the examples use
`ubuntu:bionic`)
`ubuntu:bionic`)
- Compile natively using different compilers (gcc, clang)
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
- Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
Expand Down
4 changes: 2 additions & 2 deletions appveyor/.appveyor.yml.example-full
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ environment:
BASE: 7.0

matrix:
- CMP: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: vs2022
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
- CMP: gcc
- CMP: vs2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
Expand Down
6 changes: 3 additions & 3 deletions appveyor/.appveyor.yml.example-mini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ skip_commits:
install:
- cmd: git submodule update --init --recursive

image: Visual Studio 2019
image: Visual Studio 2022

# Build Configurations: shared/static, optimized/debug
configuration:
Expand All @@ -34,9 +34,9 @@ environment:
SETUP_PATH: .ci-local:.ci

matrix:
- CMP: vs2019
- CMP: vs2022
BASE: 7.0
- CMP: vs2019
- CMP: vs2022
BASE: 3.15

# Platform: processor architecture
Expand Down
4 changes: 2 additions & 2 deletions appveyor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- One parallel runner (all builds are sequential)
- Windows Server 2012/2016/2019
- Compile using gcc/MinGW or different Visual Studio versions: \
2010, 2012, 2013, 2015, 2017, 2019
2010, 2012, 2013, 2015, 2017, 2019, 2022
- Compile for Windows 32bit and 64bit
- No useful caching available.

Expand Down Expand Up @@ -46,7 +46,7 @@
List of environment variable settings. Each list element (starting with
a dash) is one step on the axis of the build matrix. \
Set `CMP` to select the compiler: `gcc` for the native
[MinGW](http://mingw-w64.org/) GNU compiler, `vs2010` ...`vs2019`
[MinGW](http://mingw-w64.org/) GNU compiler, `vs2010` ...`vs2022`
(options listed above) for the Microsoft Visual Studio compilers.
Your builds will take long. \
Expand Down
2 changes: 1 addition & 1 deletion github-actions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
- Compile natively on Linux (gcc, clang)
- Compile natively on MacOS (clang)
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
- Compile natively on Windows (gcc/MinGW, Visual Studio 2017/2019/2022)
- Cross-compile for Windows 32bit and 64bit using MinGW and WINE
- Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
- Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
Expand Down
10 changes: 10 additions & 0 deletions github-actions/ci-scripts-build.yml.example-full
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,16 @@ jobs:
configuration: static
name: "Win2019 MSC-19, static"

- os: windows-2022
cmp: vs2022
configuration: default
name: "Win2022 MSC-22"

- os: windows-2022
cmp: vs2022
configuration: static
name: "Win2022 MSC-22, static"

steps:
- uses: actions/checkout@v2
with:
Expand Down

0 comments on commit f7e21c7

Please sign in to comment.