test

Desbordante · Aug 3, 2023 · a65fc81 · a65fc81
1 parent 8f08464
commit a65fc81
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 49 deletions.
diff --git a/.github/composite-actions/download-library/action.yml b/.github/composite-actions/download-library/action.yml
@@ -0,0 +1,23 @@
+name: 'Prepare compilation'
+description: 'Download libraries and build tools'
+inputs:
+  name:
+    description: 'Name of the library'
+    required: true
+  download-command:
+    description: 'Command to download the library'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - uses: actions/cache@v3
+      with:
+        path: ${{github.workspace}}/lib/${{inputs.name}}
+        key: ${{runner.os}}-${{inputs.name}}
+    - run: |
+        mkdir -p lib
+        sudo chown -R $USER lib
+        cd lib
+        ${{inputs.download-command}}
+      shell: bash
+      if: steps.cache-${{inputs.name}}.outputs.cache-hit != 'true'
diff --git a/.github/composite-actions/prepare-compilation/action.yml b/.github/composite-actions/prepare-compilation/action.yml
@@ -25,62 +25,26 @@ runs:
         sudo ./b2 install
       shell: bash
       if: steps.cache-boost.outputs.cache-hit != 'true'
-    - name: Cache googletest
-      uses: actions/cache@v3
-      id: cache-googletest
-      with:
-        path: ${{github.workspace}}/lib/googletest
-        key: ${{ runner.os }}-googletest
     - name: Download googletest
-      run: |
-        mkdir -p lib
-        sudo chown -R $USER lib
-        cd lib
-        git clone https://github.com/google/googletest/ --branch release-1.12.1
-      shell: bash
-      if: steps.cache-googletest.outputs.cache-hit != 'true'
-    - name: Cache easyloggingpp
-      uses: actions/cache@v3
-      id: cache-easyloggingpp
+      uses: ./.github/composite-actions/download-library
       with:
-        path: ${{github.workspace}}/lib/easyloggingpp
-        key: ${{ runner.os }}-easyloggingpp
+        name: googletest
+        download-command: git clone https://github.com/google/googletest/ --branch release-1.12.1
     - name: Download easyloggingpp
-      run: |
-        mkdir -p lib
-        sudo chown -R $USER lib
-        cd lib
-        git clone https://github.com/amrayn/easyloggingpp/ --branch v9.97.0
-      shell: bash
-      if: steps.cache-easyloggingpp.outputs.cache-hit != 'true'
-    - name: Cache better-enums
-      uses: actions/cache@v3
-      id: cache-better-enums
+      uses: ./.github/composite-actions/download-library
       with:
-        path: ${{github.workspace}}/lib/better-enums
-        key: ${{ runner.os }}better-enums
+        name: easyloggingpp
+        download-command: git clone https://github.com/amrayn/easyloggingpp/ --branch v9.97.0
     - name: Download better-enums
-      run: |
-        mkdir -p lib
-        sudo chown -R $USER lib
-        cd lib
-        git clone https://github.com/aantron/better-enums.git --branch 0.11.3
-      shell: bash
-      if: steps.cache-better-enums.outputs.cache-hit != 'true'
-    - name: Cache pybind11
-      uses: actions/cache@v3
-      id: cache-pybind11
+      uses: ./.github/composite-actions/download-library
       with:
-        path: ${{github.workspace}}/lib/pybind11
-        key: ${{ runner.os }}-pybind11
+        name: better-enums
+        download-command: git clone https://github.com/aantron/better-enums.git --branch 0.11.3
     - name: Download pybind11
-      run: |
-        mkdir -p lib
-        sudo chown -R $USER lib
-        cd lib
-        git clone https://github.com/pybind/pybind11.git --branch v2.10
-      shell: bash
-      if: steps.cache-pybind11.outputs.cache-hit != 'true'
+      uses: ./.github/composite-actions/download-library
+      with:
+        name: pybind11
+        download-command: git clone https://github.com/pybind/pybind11.git --branch v2.10
     #   Uncomment this if we set up our own git lfs server
     #
     #   - name: Install git-lfs