diff options
| author | Joe Orton <jorton@apache.org> | 2024-02-29 13:11:39 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-02-29 13:11:39 +0100 |
| commit | 7950b447abdfa31ef7b62779ba427842212f6f54 (patch) | |
| tree | 38c160219497c9e1b85834b5541879c81caedc98 /.github | |
| parent | Don't reset the balancer when we create a new child (diff) | |
| download | apache2-7950b447abdfa31ef7b62779ba427842212f6f54.tar.xz apache2-7950b447abdfa31ef7b62779ba427842212f6f54.zip | |
CI: Hopefully fix caching and artifact uploads by creating $JOBID
as a unique key for each job in the matrix, using that as the
cache key and in each artefact upload (otherwise multiple failures
uploading "error_log" overwrite each other).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916051 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d9b3c9b205..aefbeee79b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -277,7 +277,9 @@ jobs: name: ${{ matrix.name }} steps: - name: Set environment variables - run: echo "${{ matrix.env }}" >> $GITHUB_ENV + run: | + echo "${{ matrix.env }}" >> $GITHUB_ENV + echo JOBID=`echo "${{ matrix.notest-cflags }} ${{ matrix.env }} ${{ matrix.config }}'"| md5sum - | sed 's/ .*//'` >> $GITHUB_ENV - name: apt refresh run: sudo apt-get -o Acquire::Retries=5 update - name: Install prerequisites @@ -287,27 +289,23 @@ jobs: libnghttp2-dev libjansson-dev libpcre2-dev gdb perl-doc ${{ matrix.pkgs }} - uses: actions/checkout@v3 - - name: Cache APR build + - name: Cache installed libraries uses: actions/cache@v3 - env: - cache-name: cache-apru with: path: ~/root - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('/home/runner/root/.key-*') }} + key: cache-libs-${{ env.JOBID }} - name: Cache CPAN modules uses: actions/cache@v3 - env: - cache-name: cache-cpan with: path: ~/perl5 - key: ${{ runner.os }}-cpan-${{ env.cache-name }}-${{ hashFiles('/home/runner/perl5/.key') }} + key: cache-cpan-${{ env.JOBID }} - name: Configure environment run: ./test/travis_before_linux.sh timeout-minutes: 15 - uses: actions/upload-artifact@v3 if: failure() with: - name: config.log ${{ matrix.node-version }} + name: config.log-${{ env.JOBID }} path: | /home/runner/build/**/config.log - name: Build and test @@ -315,6 +313,6 @@ jobs: - uses: actions/upload-artifact@v3 if: failure() with: - name: error_log ${{ matrix.node-version }} + name: error_log-${{ env.JOBID }} path: test/perl-framework/t/logs/error_log |