diff options
| author | Eric Huss <eric@huss.org> | 2022-03-01 10:16:47 -0800 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2022-03-01 10:16:47 -0800 |
| commit | 43f83bc013270c7113cd75c27cc781df229c4645 (patch) | |
| tree | 8a0950dcbe21a3ffe6064907ba3e56e338525dca | |
| parent | 31267e80071d689230b7718fa0410a03af99798e (diff) | |
Move submodule checkout before msys2 installation.
For some reason, `tar` behaves differently in such a way that it does not create symlinks on Windows correctly, resulting in `Cannot create symlink to 'ld.gold': No such file or directory` errors.
| -rw-r--r-- | .github/workflows/ci.yml | 18 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97a31d3c970..ff3a8326315 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,6 +104,9 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB + - name: checkout submodules + run: src/ci/scripts/checkout-submodules.sh + if: success() && !env.SKIP_JOB - name: install MSYS2 run: src/ci/scripts/install-msys2.sh if: success() && !env.SKIP_JOB @@ -119,9 +122,6 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB - - name: checkout submodules - run: src/ci/scripts/checkout-submodules.sh - if: success() && !env.SKIP_JOB - name: ensure line endings are correct run: src/ci/scripts/verify-line-endings.sh if: success() && !env.SKIP_JOB @@ -502,6 +502,9 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB + - name: checkout submodules + run: src/ci/scripts/checkout-submodules.sh + if: success() && !env.SKIP_JOB - name: install MSYS2 run: src/ci/scripts/install-msys2.sh if: success() && !env.SKIP_JOB @@ -517,9 +520,6 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB - - name: checkout submodules - run: src/ci/scripts/checkout-submodules.sh - if: success() && !env.SKIP_JOB - name: ensure line endings are correct run: src/ci/scripts/verify-line-endings.sh if: success() && !env.SKIP_JOB @@ -615,6 +615,9 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB + - name: checkout submodules + run: src/ci/scripts/checkout-submodules.sh + if: success() && !env.SKIP_JOB - name: install MSYS2 run: src/ci/scripts/install-msys2.sh if: success() && !env.SKIP_JOB @@ -630,9 +633,6 @@ jobs: - name: disable git crlf conversion run: src/ci/scripts/disable-git-crlf-conversion.sh if: success() && !env.SKIP_JOB - - name: checkout submodules - run: src/ci/scripts/checkout-submodules.sh - if: success() && !env.SKIP_JOB - name: ensure line endings are correct run: src/ci/scripts/verify-line-endings.sh if: success() && !env.SKIP_JOB diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 8abf4244a38..5622422d50f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -169,6 +169,10 @@ x--expand-yaml-anchors--remove: run: src/ci/scripts/disable-git-crlf-conversion.sh <<: *step + - name: checkout submodules + run: src/ci/scripts/checkout-submodules.sh + <<: *step + - name: install MSYS2 run: src/ci/scripts/install-msys2.sh <<: *step @@ -194,10 +198,6 @@ x--expand-yaml-anchors--remove: run: src/ci/scripts/disable-git-crlf-conversion.sh <<: *step - - name: checkout submodules - run: src/ci/scripts/checkout-submodules.sh - <<: *step - - name: ensure line endings are correct run: src/ci/scripts/verify-line-endings.sh <<: *step |