From 2b6436f971f5b05f959626b3c8168c8abf32baa1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 4 Aug 2025 17:19:28 +0200 Subject: [PATCH] ci: drop unnecessary rename of *.log into *.log.txt GitLab added *.log to the allow list back in 11.4 (October 2018 [1]), but also both GitLab's code and this workaround have been broken anyway for a very long time now (they just serve everything as `content-type: application/octet-stream`), so let's just drop it. [1]: https://gitlab.com/gitlab-org/gitlab-foss/-/commit/129a60e79dd724228dda711b5789a70412ec7fb4 Part-of: --- .gitlab-ci.yml | 4 ---- .gitlab-ci/build/gitlab-ci-inc.yml | 1 - 2 files changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2b4372270d..618b737c76c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,10 +149,6 @@ default: . ${SCRIPTS_DIR}/setup-test-env.sh - eval "$S3_JWT_FILE_SCRIPT" - after_script: - # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338 - - find -name '*.log' -exec mv {} {}.txt \; - # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports: # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily retry: diff --git a/.gitlab-ci/build/gitlab-ci-inc.yml b/.gitlab-ci/build/gitlab-ci-inc.yml index 4e4fc7d12a3..2dae5acb25e 100644 --- a/.gitlab-ci/build/gitlab-ci-inc.yml +++ b/.gitlab-ci/build/gitlab-ci-inc.yml @@ -70,7 +70,6 @@ fi after_script: - if test -x /usr/bin/ccache; then ccache --show-stats | grep "Hits:"; fi - - !reference [default, after_script] .build-windows: extends: