more fixes

bot-motherlib · Oct 2, 2024 · a9a0f72 · a9a0f72
1 parent 2db5b00
commit a9a0f72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/CI_ubuntu.yaml b/.github/workflows/CI_ubuntu.yaml
@@ -18,32 +18,28 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04 #bug in std library(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115119)
-            type: Debug
+          - type: Debug
             compiler: clang
             cxx_compiler: clang++
             version: 17
 
-          - os: ubuntu-24.04
-            type: Debug
+          - type: Debug
             compiler: clang
             cxx_compiler: clang++
             version: 19
 
-          - os: ubuntu-24.04
-            type: Debug
+          - type: Debug
             compiler: gcc
             cxx_compiler: g++
             version: 11
 
-          - os: ubuntu-24.04
-            type: Debug
+          - type: Debug
             compiler: gcc
             cxx_compiler: g++
             version: 14     
 
     name: '${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}}'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04 #bug in std library(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115119)
 
     steps:
       - name: Cancel Previous Runs
@@ -56,10 +52,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/ccache
-          key: 'ubuntu-24.04 ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-dir ${{github.ref}}'
+          key: 'ubuntu-22.04 ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-dir ${{github.ref}}'
           restore-keys: |
-            ${{matrix.os}} ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-dir ${{github.ref}}
-            ${{matrix.os}} ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-
+            ubuntu-22.04 ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-dir ${{github.ref}}
+            ubuntu-22.04 ${{matrix.type}} ${{matrix.compiler}}-${{matrix.version}} ccache-
 
       - name: install based dependencies
         run: |

diff --git a/scripts/ci_ubuntu.make b/scripts/ci_ubuntu.make
@@ -1,3 +1,5 @@
+make_r ?= make -f scripts/ci_ubuntu.make
+
 .PHONY: format
 format:
 	find gbench -name '*pp' -type f | xargs clang-format-17 -i
@@ -6,13 +8,13 @@ format:
 	find samples -name '*pp' -type f | xargs clang-format-17 -i
 	find src -name '*pp' -type f | xargs clang-format-17 -i
 	find test -name '*pp' -type f | xargs clang-format-17 -i
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=.github
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=cmake
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=gbench
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=gtest
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=include
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol P=scripts
-	$(MAKE) -f scripts/ci_ubuntu.make add-eol-root
+	$(make_r) add-eol P=.github
+	$(make_r) add-eol P=cmake
+	$(make_r) add-eol P=gbench
+	$(make_r) add-eol P=gtest
+	$(make_r) add-eol P=include
+	$(make_r) add-eol P=scripts
+	$(make_r) add-eol-root
 
 .PHONY: add-eol
 add-eol: