diff options
| author | Loïc Hoguin <[email protected]> | 2023-12-18 10:36:11 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2023-12-18 10:36:11 +0100 |
| commit | 947f91dfab2d036f5b873d076933dc6531c075d6 (patch) | |
| tree | 4274ba3152103c05e7b1a17e265f242ac7bfbc43 | |
| parent | f851270b4b88e8a3af682da9558ad1742a01fed4 (diff) | |
| download | ci.erlang.mk-947f91dfab2d036f5b873d076933dc6531c075d6.tar.gz ci.erlang.mk-947f91dfab2d036f5b873d076933dc6531c075d6.tar.bz2 ci.erlang.mk-947f91dfab2d036f5b873d076933dc6531c075d6.zip | |
Rework how we delete the master build in CI
| -rw-r--r-- | .github/workflows/unix-ci.yaml | 4 | ||||
| -rw-r--r-- | early-plugins.mk | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.github/workflows/unix-ci.yaml b/.github/workflows/unix-ci.yaml index 8caae46..1f72267 100644 --- a/.github/workflows/unix-ci.yaml +++ b/.github/workflows/unix-ci.yaml @@ -41,6 +41,10 @@ jobs: ~/erlang/ key: ${{ runner.os }}-${{ runner.arch }}-Erlang-${{ inputs.erlang }} + - name: Cleanup old master if necessary + if: steps.cache.outputs.cache-hit == 'true' && inputs.erlang == 'master' + run: make ci-auto-master + - name: Run ci-prepare if: steps.cache.outputs.cache-hit != 'true' || inputs.erlang == 'master' run: make -k ci-prepare CI_OTP=${{ inputs.erlang }} diff --git a/early-plugins.mk b/early-plugins.mk index 96b36d4..c8a9457 100644 --- a/early-plugins.mk +++ b/early-plugins.mk @@ -141,7 +141,10 @@ endif endif ifdef AUTO_CI_MASTER_MINS -ci:: $(KERL) +ci:: + $(verbose) $(MAKE) --no-print-directory ci-auto-master + +ci-auto-master: $(KERL) ifneq ($(wildcard $(KERL_INSTALL_DIR)/master),) $(verbose) if find $(KERL_INSTALL_DIR)/master/activate \ -mmin +$(AUTO_CI_MASTER_MINS) | grep -q master; then \ |