CI update

epics-base · Mar 12, 2021 · 20edb8f · 20edb8f
1 parent babda34
commit 20edb8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.ci b/.ci
diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
@@ -93,21 +93,21 @@ jobs:
 
           - os: ubuntu-16.04
             cmp: gcc-4.8
-            utoolchain: true
+            utoolchain: "4.8"
             configuration: default
             base: "7.0"
             name: "7.0 Ub-16 gcc-4.8"
 
           - os: ubuntu-16.04
             cmp: gcc-4.9
-            utoolchain: true
+            utoolchain: "4.9"
             configuration: default
             base: "7.0"
             name: "7.0 Ub-16 gcc-4.9"
 
           - os: ubuntu-20.04
             cmp: gcc-8
-            utoolchain: true
+            utoolchain: "8"
             configuration: default
             base: "7.0"
             name: "7.0 Ub-20 gcc-8"
@@ -144,18 +144,19 @@ jobs:
       uses: actions/cache@v2
       with:
         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"
       run: |
         sudo apt-get update
         sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
       if: runner.os == 'Linux'
-    - name: "apt-get install ${{ matrix.cmp }}"
+    - name: "apt-get install gcc-${{ matrix.utoolchain }}"
       run: |
+        sudo apt-get update
         sudo apt-get -y install software-properties-common
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         sudo apt-get update
-        sudo apt-get -y install ${{ matrix.cmp }}
+        sudo apt-get -y install g++-${{ matrix.utoolchain }}
       if: matrix.utoolchain
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
+31 −0		.github/workflows/build-and-test.yml
+4 −4		README.md
+50 −15		cue.py
+137 −117		github-actions/ci-scripts-build.yml.example-full
+45 −8		github-actions/ci-scripts-build.yml.example-mini