From 76000dc767a9dc1dcb3b65bbfd8bb8046c79e3ab Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 14:49:37 +0200 Subject: [PATCH] using tag submodules for checkout in workflows --- .github/workflows/BuildAndRelease.yml | 40 +++++++-------------------- .github/workflows/BuildMacOS.yml | 8 ++---- .github/workflows/BuildUbuntu.yml | 24 ++++------------ .github/workflows/BuildWindows.yml | 16 +++-------- 4 files changed, 22 insertions(+), 66 deletions(-) diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml index f6d9b3788..fd704cee4 100644 --- a/.github/workflows/BuildAndRelease.yml +++ b/.github/workflows/BuildAndRelease.yml @@ -11,12 +11,8 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Setup env variables id: envs run: | @@ -43,12 +39,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install Qt uses: jurplel/install-qt-action@v2 with: @@ -96,12 +88,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install dependencies run: | #needed for some reason... @@ -131,12 +119,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install dependencies run: | brew install libomp @@ -179,12 +163,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Downlaod Jom run: | Invoke-WebRequest -Uri "http://download.qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip" diff --git a/.github/workflows/BuildMacOS.yml b/.github/workflows/BuildMacOS.yml index b6d6f7da3..6ad59ed4e 100644 --- a/.github/workflows/BuildMacOS.yml +++ b/.github/workflows/BuildMacOS.yml @@ -10,12 +10,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install dependencies run: | brew install libomp diff --git a/.github/workflows/BuildUbuntu.yml b/.github/workflows/BuildUbuntu.yml index 46c70cfb8..0143c97ea 100644 --- a/.github/workflows/BuildUbuntu.yml +++ b/.github/workflows/BuildUbuntu.yml @@ -10,12 +10,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install Qt uses: jurplel/install-qt-action@v2 with: @@ -62,12 +58,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install dependencies run: | #needed for some reason... @@ -96,12 +88,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Install dependencies run: | sh install/linux/linux_setup_env_ubuntu.sh diff --git a/.github/workflows/BuildWindows.yml b/.github/workflows/BuildWindows.yml index 1a5cee60e..c44f3c8d0 100644 --- a/.github/workflows/BuildWindows.yml +++ b/.github/workflows/BuildWindows.yml @@ -9,12 +9,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Downlaod Jom run: | Invoke-WebRequest -Uri "http://download.qt.io/official_releases/jom/jom_1_1_3.zip" -OutFile "jom_1_1_3.zip" @@ -69,12 +65,8 @@ jobs: steps: - uses: actions/checkout@v2 - - 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 + with: + submodules: true - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt