Skip to content

Commit

Permalink
Don't tar build-scan-data in GitHub actions workflows
Browse files Browse the repository at this point in the history
We don't need tars, as workflow artifacts are already zipped.
  • Loading branch information
yrodiere authored and marko-bekhta committed Oct 28, 2024
1 parent 3037821 commit d6138a1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
run: |
shopt -s nullglob # Don't run the loop below if there are no artifacts
status=0
mkdir -p ~/.m2/.develocity/
for build_scan_data_directory in /tmp/downloaded-build-scan-data/*
do
rm -rf ~/.m2/.develocity/build-scan-data
mkdir -p ~/.m2/.develocity/build-scan-data
tar -xzf "$build_scan_data_directory/build-scan-data.tgz" -C ~/.m2/.develocity/build-scan-data \
mv "$build_scan_data_directory" ~/.m2/.develocity/build-scan-data \
&& ./mvnw $MAVEN_ARGS develocity:build-scan-publish-previous || status=1
done
exit $status
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,15 @@ jobs:
-Pjqassistant -Pdist -Pci-build -DskipITs
env:
DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
# For jobs running on 'pull_request', tar and upload build scan data.
# For jobs running on 'pull_request', upload build scan data.
# The actual publishing must be done in a separate job (see ci-report.yml).
# We don't write to the remote cache as that would be unsafe.
- name: Tar build scan content pushed to subsequent jobs
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
run: tar -czf build-scan-data.tgz -C ~/.m2/.develocity/build-scan-data .
- name: Upload GitHub Actions artifact for the Develocity build scan
uses: actions/upload-artifact@v4
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
with:
name: build-scan-data-initial-${{ matrix.os.name }}
path: build-scan-data.tgz
path: ~/.m2/.develocity/build-scan-data

- name: Run integration tests in the default environment
run: |
Expand All @@ -140,15 +137,12 @@ jobs:
env:
DEVELOCITY_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_KEY || '' }}"
# Same as above, but for the build scan of the latest Maven run.
- name: Tar build scan content pushed to subsequent jobs
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
run: tar -czf build-scan-data.tgz -C ~/.m2/.develocity/build-scan-data .
- name: Upload GitHub Actions artifact for the Develocity build scan
uses: actions/upload-artifact@v4
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
with:
name: build-scan-data-integrationtest-${{ matrix.os.name }}
path: build-scan-data.tgz
path: ~/.m2/.develocity/build-scan-data

- name: Docker cleanup
run: ./ci/docker-cleanup.sh
Expand Down

0 comments on commit d6138a1

Please sign in to comment.