submodule update as github checkout@v2 action (#594)

Alexey-N-Chernyshov · web-flow · commit e7765eb2eabc · 2022-02-11T15:03:44.000+03:00
Signed-off-by: Alexey Chernyshov &lt;alexey.n.chernyshov@gmail.com&gt;
diff --git a/.github/disabled_workflows/clang-tidy.yml b/.github/disabled_workflows/clang-tidy.yml
@@ -13,13 +13,9 @@ jobs:
     runs-on: macOS-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
       name: checkout repo
-    - name: checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
     - name: install
       run: |
         brew install ninja llvm pkg-config
diff --git a/.github/disabled_workflows/msan.yml b/.github/disabled_workflows/msan.yml
@@ -1,4 +1,4 @@
-#TODO: uncomment if MSAN is required. Note: all dependencies must be instrumented to pass.
+##TODO: uncomment if MSAN is required. Note: all dependencies must be instrumented to pass.
 #name: MSAN
 #
 #on:
@@ -14,6 +14,8 @@
 #    runs-on: ubuntu-20.04
 #    steps:
 #    - uses: actions/checkout@v2
+#      with:
+#        submodules: 'recursive'
 #      name: checkout repo
 #    - name: cache
 #      uses: actions/cache@v1.2.0
@@ -23,12 +25,6 @@
 #      with:
 #        path: /var/tmp/filecoin-proof-parameters
 #        key: build-${{ env.cache-name }}-${{ env.version }}
-#    - name: checkout submodules
-#      shell: bash
-#      run: |
-#        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-#        git submodule sync --recursive
-#        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
 #    - name: install
 #      run: |
 #        sudo apt-get update
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
         name: checkout repo
       - name: cache
         uses: actions/cache@v1.2.0
@@ -22,12 +24,6 @@ jobs:
         with:
           path: /var/tmp/filecoin-proof-parameters
           key: build-${{ env.cache-name }}-${{ env.version }}
-      - name: checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
       - name: install
         run: |
           sudo apt-get update
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,10 @@ name: CI
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - master
+      - master
 
 jobs:
   build:
@@ -15,14 +15,14 @@ jobs:
       fail-fast: false
       matrix:
         # 3 jobs in total
-        os: [ubuntu-20.04, macOS-latest]
-        compiler: [{
+        os: [ ubuntu-20.04, macOS-latest ]
+        compiler: [ {
           "cc": "gcc",
           "cxx": "g++"
-         }, {
+        }, {
           "cc": "clang",
           "cxx": "clang++"
-        }]
+        } ]
         exclude:
           - os: macOS-latest
             compiler:
@@ -37,68 +37,64 @@ jobs:
               CFLAGS: "-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include"
               CXXFLAGS: "-isysroot/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include"
     steps:
-    - uses: actions/checkout@v2
-      name: checkout repo
-    - name: cache
-      uses: actions/cache@v1.2.0
-      env:
-        cache-name: cache-filecoin-ffi-proofs
-        version: v28
-      with:
-        path: /var/tmp/filecoin-proof-parameters
-        key: build-${{ env.cache-name }}-${{ env.version }}
-    - name: checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-    - name: install dependencies
-      run: |
-        set -e
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          echo "LIBRARY_PATH=$LIBRARY_PATH:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
-          brew install ninja pkg-config libb2 hwloc
-        else
-          sudo apt-get update
-          sudo apt-get install -y ninja-build python-setuptools pkg-config ocl-icd-* opencl-headers libhwloc-dev
-        fi
-
-        pip3 -V || sudo python3 -m pip install --upgrade pip
-        sudo pip3 install scikit-build
-        sudo pip3 install requests gitpython gcovr pyyaml
-        sudo curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-        # Workaround to provide additional free space for testing.
-        #   https://github.com/actions/virtual-environments/issues/2875
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /opt/ghc
-    - name: cmake
-      env:
-        CC: ${{ matrix.compiler.cc }}
-        CXX: ${{ matrix.compiler.cxx }}
-        CFLAGS: ${{ matrix.env.CFLAGS }}
-        CXXFLAGS: ${{ matrix.env.CXXFLAGS }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # has to be included to access other secrets
-        GITHUB_HUNTER_USERNAME: ${{ secrets.HUNTER_USERNAME }}
-        GITHUB_HUNTER_TOKEN: ${{ secrets.HUNTER_TOKEN }}
-        COVERAGE: ${{ matrix.env.COVERAGE }}
-      run: cmake . -GNinja -Bbuild $COVERAGE -D TESTING_PROOFS=ON -D TESTING_ACTORS=ON
-    - name: build
-      run: cmake --build build -- -j2
-    - name: tests
-      env:
-        CTEST_OUTPUT_ON_FAILURE: 1
-      run: cmake --build build --target test
-    - name: prepare coverage report
-      if: runner.os == 'Linux' && matrix.compiler.cc == 'gcc'
-      run: cmake --build build --target ctest_coverage_norun
-    - name: upload report to codecov
-      if: runner.os == 'Linux' && matrix.compiler.cc == 'gcc'
-      uses: codecov/codecov-action@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # has to be included to access other secrets
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./build/ctest_coverage_norun.xml
-        name: codecov-umbrella
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+        name: checkout repo
+      - name: cache
+        uses: actions/cache@v1.2.0
+        env:
+          cache-name: cache-filecoin-ffi-proofs
+          version: v28
+        with:
+          path: /var/tmp/filecoin-proof-parameters
+          key: build-${{ env.cache-name }}-${{ env.version }}
+      - name: install dependencies
+        run: |
+          set -e
+          if [ "$RUNNER_OS" = "macOS" ]; then
+            echo "LIBRARY_PATH=$LIBRARY_PATH:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
+            brew install ninja pkg-config libb2 hwloc
+          else
+            sudo apt-get update
+            sudo apt-get install -y ninja-build python-setuptools pkg-config ocl-icd-* opencl-headers libhwloc-dev
+          fi
+          
+          pip3 -V || sudo python3 -m pip install --upgrade pip
+          sudo pip3 install scikit-build
+          sudo pip3 install requests gitpython gcovr pyyaml
+          sudo curl https://sh.rustup.rs -sSf | sh -s -- -y
+          
+          # Workaround to provide additional free space for testing.
+          #   https://github.com/actions/virtual-environments/issues/2875
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+      - name: cmake
+        env:
+          CC: ${{ matrix.compiler.cc }}
+          CXX: ${{ matrix.compiler.cxx }}
+          CFLAGS: ${{ matrix.env.CFLAGS }}
+          CXXFLAGS: ${{ matrix.env.CXXFLAGS }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # has to be included to access other secrets
+          GITHUB_HUNTER_USERNAME: ${{ secrets.HUNTER_USERNAME }}
+          GITHUB_HUNTER_TOKEN: ${{ secrets.HUNTER_TOKEN }}
+          COVERAGE: ${{ matrix.env.COVERAGE }}
+        run: cmake . -GNinja -Bbuild $COVERAGE -D TESTING_PROOFS=ON -D TESTING_ACTORS=ON
+      - name: build
+        run: cmake --build build -- -j2
+      - name: tests
+        env:
+          CTEST_OUTPUT_ON_FAILURE: 1
+        run: cmake --build build --target test
+      - name: prepare coverage report
+        if: runner.os == 'Linux' && matrix.compiler.cc == 'gcc'
+        run: cmake --build build --target ctest_coverage_norun
+      - name: upload report to codecov
+        if: runner.os == 'Linux' && matrix.compiler.cc == 'gcc'
+        uses: codecov/codecov-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # has to be included to access other secrets
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./build/ctest_coverage_norun.xml
+          name: codecov-umbrella
diff --git a/.github/workflows/lsan.yml b/.github/workflows/lsan.yml
@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
       name: checkout repo
     - name: cache
       uses: actions/cache@v1.2.0
@@ -22,12 +24,6 @@ jobs:
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}
-    - name: checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
     - name: install
       run: |
         sudo apt-get update
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -13,6 +13,8 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
         name: checkout repo
       - name: cache
         uses: actions/cache@v1.2.0
@@ -22,12 +24,6 @@ jobs:
         with:
           path: /var/tmp/filecoin-proof-parameters
           key: build-${{ env.cache-name }}-${{ env.version }}
-      - name: checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
       - name: install
         run: |
           echo "LIBRARY_PATH=$LIBRARY_PATH:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
       name: checkout repo
     - name: cache
       uses: actions/cache@v1.2.0
@@ -22,12 +24,6 @@ jobs:
       with:
         path: /var/tmp/filecoin-proof-parameters
         key: build-${{ env.cache-name }}-${{ env.version }}
-    - name: checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
     - name: install
       run: |
         sudo apt-get update
