Skip to content

Commit a761fa6

Browse files
committed
Don't cache getlimits
1 parent d2db872 commit a761fa6

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

.github/workflows/GnuTests.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: GnuTests
22

33
# spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
44
# spell-checker:ignore (jargon) submodules devel
5-
# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
5+
# spell-checker:ignore (libs/utils) chksum dpkg getenforce gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
66
# spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
77
# spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
88
# spell-checker:ignore (vars) FILESET SUBDIRS XPASS
@@ -52,14 +52,6 @@ jobs:
5252
workspaces: "./uutils -> target"
5353
- name: Checkout code (GNU coreutils)
5454
run: (mkdir -p gnu && cd gnu && bash ../uutils/util/fetch-gnu.sh)
55-
- name: Restore files for faster configure and skipping make
56-
uses: actions/cache@v5
57-
id: cache-config-gnu
58-
with:
59-
path: |
60-
gnu/config.cache
61-
gnu/src/getlimits
62-
key: ${{ runner.os }}-gnu-config-${{ hashFiles('gnu/NEWS') }}-${{ hashFiles('uutils/util/build-gnu.sh') }} # use build-gnu.sh for extremely safe caching
6355

6456
#### Build environment setup
6557
- name: Install dependencies
@@ -105,15 +97,6 @@ jobs:
10597
cd 'uutils'
10698
env PROFILE=release-small bash util/build-gnu.sh
10799
108-
- name: Save files for faster configure and skipping make
109-
uses: actions/cache/save@v5
110-
if: always() && steps.cache-config-gnu.outputs.cache-hit != 'true'
111-
with:
112-
path: |
113-
gnu/config.cache
114-
gnu/src/getlimits
115-
key: ${{ runner.os }}-gnu-config-${{ hashFiles('gnu/NEWS') }}-${{ hashFiles('uutils/util/build-gnu.sh') }}
116-
117100
### Run tests as user
118101
- name: Run GNU tests
119102
shell: bash

util/build-gnu.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ sed -i "s/^[[:blank:]]*PATH=.*/ PATH='${UU_BUILD_DIR//\//\\/}\$(PATH_SEPARATOR)
116116

117117
if test -f gnu-built; then
118118
echo "GNU build already found. Skip"
119-
echo "'rm -f $(pwd)/{gnu-built,src/getlimits}' to force the build"
119+
echo "'rm -f $(pwd)/gnu-built' to force the build"
120120
echo "Note: the customization of the tests will still happen"
121121
else
122122
# Disable useless checks
@@ -135,9 +135,8 @@ else
135135
# Skip make if possible
136136
# Use GNU nproc for *BSD and macOS
137137
NPROC="$(command -v nproc||command -v gnproc)"
138-
test "${SELINUX_ENABLED}" = 1 && touch src/getlimits # SELinux tests does not use it
139-
test -f src/getlimits || make -j "$("${NPROC}")"
140-
cp -f src/getlimits "${UU_BUILD_DIR}"
138+
test "${SELINUX_ENABLED}" = 1 || make -j "$("${NPROC}")" # SELinux tests does not use it
139+
test "${SELINUX_ENABLED}" = 1 || cp -f src/getlimits "${UU_BUILD_DIR}"
141140

142141
# Handle generated factor tests
143142
t_first=00

0 commit comments

Comments
 (0)