Skip to content

ci: Fix DTBs upload after version upgrade #2934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2025
Merged

ci: Fix DTBs upload after version upgrade #2934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f8d735
ci: azure_pipelines: Update DTBs location
bia1708 Sep 4, 2025
c0b7c26
ci: prepare_artifacts: Fix DTBs upload
bia1708 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ stages:
displayName: 'Device-Tree Build Test'
- task: CopyFiles@2
inputs:
sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts'
contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/?(*.dtb)'
sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/intel/socfpga'
contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/intel/socfpga/?(*.dtb)'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: CopyFiles@2
inputs:
sourceFolder: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/xilinx'
contents: '$(Agent.BuildDirectory)/s/arch/arm/boot/dts/xilinx/?(*.dtb)'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: CopyFiles@2
inputs:
Expand Down
20 changes: 10 additions & 10 deletions ci/travis/prepare_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#!/bin/bash -e

TIMESTAMP=$(date +%Y_%m_%d-%H_%M)
TIMESTAMP=$(date +%Y_%m_%d-%H_%M_%S)
# For PRs, Azure makes a merge commit (HEAD) because of the shallow copy option
# (which we want). So, GIT_SHA in this case is the actual correct commit inside
# the PR, and MERGE_COMMIT is the commit made by Azure (which we extract the date
Expand Down Expand Up @@ -88,17 +88,17 @@ artifacts_structure() {
echo "IMAGE: ${image_to_copy[${platform}]}!"
cp ${image_to_copy[${platform}]} ${image_location}
fi
done

if [ "${arch}" == "microblaze" ]; then
dtbs_to_copy=$(ls -d -1 Microblaze/*)
else
dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}")
fi
if [ "${arch}" == "microblaze" ]; then
dtbs_to_copy=$(ls -d -1 Microblaze/*)
else
dtbs_to_copy=$(ls -d -1 DTBs/* | grep "${platform}[-|_]")
fi

# Copy DTBs to the correct location
for dtb in ${dtbs_to_copy}; do
cp ${dtb} "${TIMESTAMP}/${arch}"
# Copy DTBs to the correct location
for dtb in ${dtbs_to_copy}; do
cp ${dtb} "${TIMESTAMP}/${arch}"
done
done
done
}
Expand Down
Loading