Merge branch 'master' into buildinfo_in_cachekey

This commit is contained in:
Antony Peacock
2023-01-06 11:30:07 +00:00
committed by GitHub
6 changed files with 64 additions and 30 deletions

View File

@@ -26,7 +26,7 @@ on: [push, pull_request]
jobs: jobs:
check: check:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set up Python 3.8 - name: Set up Python 3.8

View File

@@ -50,7 +50,7 @@ jobs:
} }
- { - {
name: "Ubuntu GCC-10", name: "Ubuntu GCC-10",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: GCC, type: GCC,
@@ -63,7 +63,7 @@ jobs:
} }
- { - {
name: "Ubuntu GCC-11", name: "Ubuntu GCC-11",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: GCC, type: GCC,
@@ -74,6 +74,19 @@ jobs:
}, },
lib: "libstdc++11", lib: "libstdc++11",
} }
- {
name: "Ubuntu GCC-12",
os: ubuntu-22.04,
compiler:
{
type: GCC,
version: 12,
cc: "gcc-12",
cxx: "g++-12",
std: 20,
},
lib: "libstdc++11",
}
- { - {
name: "Ubuntu Clang-12 + libstdc++11", name: "Ubuntu Clang-12 + libstdc++11",
os: ubuntu-20.04, os: ubuntu-20.04,
@@ -102,7 +115,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-13 + libc++", name: "Ubuntu Clang-13 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,
@@ -115,7 +128,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-14 + libc++", name: "Ubuntu Clang-14 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,
@@ -128,7 +141,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-15 + libc++", name: "Ubuntu Clang-15 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,
@@ -179,8 +192,8 @@ jobs:
with: with:
key: ${{ matrix.config.os }}-${{ matrix.config.compiler.type }}-${{ matrix.config.compiler.version }}-${{ matrix.config.lib }}-${{ matrix.build_type }}-${{ matrix.downcast_mode }} key: ${{ matrix.config.os }}-${{ matrix.config.compiler.type }}-${{ matrix.config.compiler.version }}-${{ matrix.config.lib }}-${{ matrix.build_type }}-${{ matrix.downcast_mode }}
max-size: 50M max-size: 50M
- name: Install gcc-11 - name: Install gcc-12
if: matrix.config.compiler.type == 'GCC' && matrix.config.compiler.version == '11' if: matrix.config.compiler.type == 'GCC' && matrix.config.compiler.version == '12'
shell: bash shell: bash
run: | run: |
sudo apt install -y g++-${{ matrix.config.compiler.version }} sudo apt install -y g++-${{ matrix.config.compiler.version }}

View File

@@ -54,7 +54,7 @@ jobs:
} }
- { - {
name: "Ubuntu GCC-10", name: "Ubuntu GCC-10",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: GCC, type: GCC,
@@ -67,7 +67,7 @@ jobs:
} }
- { - {
name: "Ubuntu GCC-11", name: "Ubuntu GCC-11",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: GCC, type: GCC,
@@ -78,6 +78,19 @@ jobs:
}, },
lib: "libstdc++11", lib: "libstdc++11",
} }
- {
name: "Ubuntu GCC-12",
os: ubuntu-22.04,
compiler:
{
type: GCC,
version: 12,
cc: "gcc-12",
cxx: "g++-12",
std: 20,
},
lib: "libstdc++11",
}
- { - {
name: "Ubuntu Clang-12 + libstdc++11", name: "Ubuntu Clang-12 + libstdc++11",
os: ubuntu-20.04, os: ubuntu-20.04,
@@ -106,7 +119,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-13 + libc++", name: "Ubuntu Clang-13 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,
@@ -119,7 +132,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-14 + libc++", name: "Ubuntu Clang-14 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,
@@ -132,7 +145,7 @@ jobs:
} }
- { - {
name: "Ubuntu Clang-15 + libc++", name: "Ubuntu Clang-15 + libc++",
os: ubuntu-20.04, os: ubuntu-22.04,
compiler: compiler:
{ {
type: CLANG, type: CLANG,

View File

@@ -25,7 +25,7 @@ on:
jobs: jobs:
analyze: analyze:
name: Analyze name: Analyze
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
env: env:
CC: gcc-10 CC: gcc-10
CXX: g++-10 CXX: g++-10

View File

@@ -45,7 +45,7 @@ env:
jobs: jobs:
docs: docs:
name: Generate documentation name: Generate documentation
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Cache Conan data - name: Cache Conan data

View File

@@ -168,7 +168,15 @@ ISO 80000 [1]_ definitions
value of a quantity value of a quantity
value value
- Number and reference together expressing magnitude of a `quantity`. - Number and reference together expressing magnitude of a `quantity`.
- The number can be complex.
- A quantity value can be presented in more than one way. - A quantity value can be presented in more than one way.
- In the case of vector or tensor quantities, each component has a quantity value.
- For example, force acting on a given particle, e.g. in Cartesian components
:math:`(F_x; F_y; F_z) = (31,5; 43,2; 17,0) N`, where
:math:`(31,5; 43,2; 17,0)` is a numerical-value vector and :math:`N` (newton)
is the unit, or :math:`(F_x; F_y; F_z) = (31,5 N; 43,2 N; 17,0 N)`
where each component is a quantity.
Other definitions Other definitions