EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

CI update

Browse Source
This commit is contained in:
Michael Davidsaver
2021-03-12 10:33:20 -08:00
parent babda345b4
commit 20edb8fdf5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci

Submodule .ci updated: ad8dd4a136...3db08b5977

13
.github/workflows/ci-scripts-build.yml vendored
View File

@ -93,21 +93,21 @@ jobs:
- os: ubuntu-16.04 - os: ubuntu-16.04
cmp: gcc-4.8 cmp: gcc-4.8
utoolchain: true utoolchain: "4.8"
configuration: default configuration: default
base: "7.0" base: "7.0"
name: "7.0 Ub-16 gcc-4.8" name: "7.0 Ub-16 gcc-4.8"
- os: ubuntu-16.04 - os: ubuntu-16.04
cmp: gcc-4.9 cmp: gcc-4.9
utoolchain: true utoolchain: "4.9"
configuration: default configuration: default
base: "7.0" base: "7.0"
name: "7.0 Ub-16 gcc-4.9" name: "7.0 Ub-16 gcc-4.9"
- os: ubuntu-20.04 - os: ubuntu-20.04
cmp: gcc-8 cmp: gcc-8
utoolchain: true utoolchain: "8"
configuration: default configuration: default
base: "7.0" base: "7.0"
name: "7.0 Ub-20 gcc-8" name: "7.0 Ub-20 gcc-8"
@ -144,18 +144,19 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ~/.cache path: ~/.cache
key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }} key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}/${{ hashFiles('.github/workflows/ci-scripts-build.yml') }}
- name: "apt-get install" - name: "apt-get install"
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
if: runner.os == 'Linux' if: runner.os == 'Linux'
- name: "apt-get install ${{ matrix.cmp }}" - name: "apt-get install gcc-${{ matrix.utoolchain }}"
run: | run: |
sudo apt-get update
sudo apt-get -y install software-properties-common sudo apt-get -y install software-properties-common
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get -y install ${{ matrix.cmp }} sudo apt-get -y install g++-${{ matrix.utoolchain }}
if: matrix.utoolchain if: matrix.utoolchain
- name: Prepare and compile dependencies - name: Prepare and compile dependencies
run: python .ci/cue.py prepare run: python .ci/cue.py prepare