aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/basic.yml21
-rw-r--r--.github/workflows/boost_clang_windows.yml6
-rw-r--r--.github/workflows/boost_download.yml4
-rw-r--r--.github/workflows/boost_toolsets.yml6
-rw-r--r--.github/workflows/ci_appveyor.yml2
-rw-r--r--.github/workflows/ci_github.yml6
-rw-r--r--.github/workflows/ci_travis.yml4
-rw-r--r--.github/workflows/cygwin_static_libstdc++.yml2
-rw-r--r--.github/workflows/example_toolsets.yml6
-rw-r--r--.github/workflows/msvc_versions.yml2
10 files changed, 18 insertions, 41 deletions
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index bfb6212..c56bd9c 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -21,14 +21,11 @@ jobs:
basic:
strategy:
matrix:
- os: [ubuntu-18.04, windows-2016, windows-2019]
+ os: [ubuntu-20.04, windows-2016, windows-2019]
include:
- # Prettier run names.
- - {os: windows-2016, name: VS 2017}
- - {os: windows-2019, name: VS 2019}
- - {os: ubuntu-18.04, name: Ubuntu}
+ - boost-version: 1.72.0
runs-on: '${{ matrix.os }}'
- name: '${{ matrix.name }}'
+ name: 'Build: ${{ matrix.os }}'
defaults:
run:
shell: pwsh
@@ -37,21 +34,19 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Cache Boost
uses: actions/cache@v2
with:
path: boost_*.tar.gz
- key: boost_1.72.0
+ key: 'boost_${{ matrix.boost-version }}'
- name: Build Boost
run: |
- python -m project.boost.download --cache . 1.72.0
- python -m project.boost.build -- boost_1_72_0 --with-filesystem
+ python -m project.boost.download --cache . '${{ matrix.boost-version }}' boost
+ python -m project.boost.build -- boost --with-filesystem
- name: Build example project
run: |
$src_dir = Join-Path examples boost
- python -m project.cmake.build --boost boost_1_72_0 --install install -- $src_dir
+ python -m project.cmake.build --boost boost --install install -- $src_dir
- name: Run example project
run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo)
@@ -65,8 +60,6 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: 3
- name: Verify package can be installed
run: python3 -m pip install .
- name: Install package builder
diff --git a/.github/workflows/boost_clang_windows.yml b/.github/workflows/boost_clang_windows.yml
index 43dbe6d..6c2612d 100644
--- a/.github/workflows/boost_clang_windows.yml
+++ b/.github/workflows/boost_clang_windows.yml
@@ -50,8 +50,6 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Install Clang
uses: egor-tensin/setup-clang@v1
@@ -59,12 +57,12 @@ jobs:
- name: Set up software environment
uses: ./.github/actions/software-environment
with:
- toolset: ${{ matrix.toolset }}
+ toolset: '${{ matrix.toolset }}'
- name: Download Boost
uses: ./.github/actions/download-boost
with:
- boost-version: ${{ matrix.boost-version }}
+ boost-version: '${{ matrix.boost-version }}'
- name: Bootstrap Boost
run: |
diff --git a/.github/workflows/boost_download.yml b/.github/workflows/boost_download.yml
index 0cd7f94..a9eb826 100644
--- a/.github/workflows/boost_download.yml
+++ b/.github/workflows/boost_download.yml
@@ -14,7 +14,7 @@ jobs:
matrix:
boost-version: [1.58.0, 1.72.0]
runs-on: ubuntu-20.04
- name: 'Download / ${{ matrix.boost-version }}'
+ name: 'Download: ${{ matrix.boost-version }}'
defaults:
run:
shell: pwsh
@@ -23,8 +23,6 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Download Boost
uses: ./.github/actions/download-boost
with:
diff --git a/.github/workflows/boost_toolsets.yml b/.github/workflows/boost_toolsets.yml
index b8d885a..9f81156 100644
--- a/.github/workflows/boost_toolsets.yml
+++ b/.github/workflows/boost_toolsets.yml
@@ -19,8 +19,8 @@ jobs:
include:
# Prettier run names.
- - {os: windows-2019, name: VS 2019}
- - {os: windows-2016, name: VS 2017}
+ - {os: windows-2019, name: Windows 2019}
+ - {os: windows-2016, name: Windows 2016}
- {os: ubuntu-18.04, name: Ubuntu}
- {cygwin: 1, name: Cygwin}
# Target platform.
@@ -127,8 +127,6 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
if: '!env.CI_HOST_CYGWIN'
- name: Install Cygwin
diff --git a/.github/workflows/ci_appveyor.yml b/.github/workflows/ci_appveyor.yml
index 752d2d5..fd4494f 100644
--- a/.github/workflows/ci_appveyor.yml
+++ b/.github/workflows/ci_appveyor.yml
@@ -35,8 +35,6 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Cache Boost
uses: actions/cache@v2
with:
diff --git a/.github/workflows/ci_github.yml b/.github/workflows/ci_github.yml
index c5c6d10..b01d041 100644
--- a/.github/workflows/ci_github.yml
+++ b/.github/workflows/ci_github.yml
@@ -12,11 +12,11 @@ jobs:
build:
strategy:
matrix:
- os: [ubuntu-18.04, windows-2019]
+ os: [ubuntu-20.04, windows-2019]
toolset: [gcc, clang, msvc]
configuration: [Debug, Release]
exclude:
- - {os: ubuntu-18.04, toolset: msvc}
+ - {os: ubuntu-20.04, toolset: msvc}
- {os: windows-2019, toolset: gcc}
- {os: windows-2019, toolset: clang}
runs-on: '${{ matrix.os }}'
@@ -34,8 +34,6 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Cache Boost
uses: actions/cache@v2
with:
diff --git a/.github/workflows/ci_travis.yml b/.github/workflows/ci_travis.yml
index 801e9b1..b9a31d9 100644
--- a/.github/workflows/ci_travis.yml
+++ b/.github/workflows/ci_travis.yml
@@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
configuration: [Debug, Release]
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
name: '${{ matrix.configuration }}'
defaults:
run:
@@ -33,8 +33,6 @@ jobs:
uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Cache Boost
uses: actions/cache@v2
with:
diff --git a/.github/workflows/cygwin_static_libstdc++.yml b/.github/workflows/cygwin_static_libstdc++.yml
index 36c55c2..7cf4c0b 100644
--- a/.github/workflows/cygwin_static_libstdc++.yml
+++ b/.github/workflows/cygwin_static_libstdc++.yml
@@ -36,7 +36,7 @@ jobs:
- name: Set common variables
uses: ./.github/actions/common-variables
with:
- toolset: '${{ matrix.toolset }}'
+ toolset: gcc
cygwin: 1
- name: Install Cygwin
diff --git a/.github/workflows/example_toolsets.yml b/.github/workflows/example_toolsets.yml
index b3802fe..4f0f8de 100644
--- a/.github/workflows/example_toolsets.yml
+++ b/.github/workflows/example_toolsets.yml
@@ -19,8 +19,8 @@ jobs:
include:
# Prettier run names.
- - {os: windows-2019, name: VS 2019}
- - {os: windows-2016, name: VS 2017}
+ - {os: windows-2019, name: Windows 2019}
+ - {os: windows-2016, name: Windows 2016}
- {os: ubuntu-18.04, name: Ubuntu}
- {cygwin: 1, name: Cygwin}
# Target platform.
@@ -85,8 +85,6 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
if: '!env.CI_HOST_CYGWIN'
- name: Install Cygwin
diff --git a/.github/workflows/msvc_versions.yml b/.github/workflows/msvc_versions.yml
index d55ef00..2103165 100644
--- a/.github/workflows/msvc_versions.yml
+++ b/.github/workflows/msvc_versions.yml
@@ -67,8 +67,6 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
- with:
- python-version: '3.x'
- name: Set up software environment
uses: ./.github/actions/software-environment
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 16:41:43 +0000