Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GHA] Test inclusion of JustJ into aggregate distro update sites

Browse Source
This commit is contained in:
aboyko
2024-06-05 13:15:56 -04:00
parent 703a053f09
commit 52ffacac02
2 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/scripts/generate-composite-site-files.sh vendored
View File

@@ -1,5 +1,6 @@
val=$1
url=$2
justj21=$3
rm -f ./compositeArtifacts.xml
rm -f ./compositeContent.xml
@@ -12,9 +13,16 @@ echo " type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArt
echo " <properties size='1'>" >> compositeArtifacts.xml
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeArtifacts.xml
echo " </properties>" >> compositeArtifacts.xml
echo " <children size='1'>" >> compositeArtifacts.xml
echo " <child location='${url}'/>" >> compositeArtifacts.xml
echo " </children>" >> compositeArtifacts.xml
if [ "${jusstj21}" = true ] ; then
echo " <children size='2'>" >> compositeArtifacts.xml
echo " <child location='${url}'/>" >> compositeArtifacts.xml
echo " <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeArtifacts.xml
echo " </children>" >> compositeArtifacts.xml
else
echo " <children size='1'>" >> compositeArtifacts.xml
echo " <child location='${url}'/>" >> compositeArtifacts.xml
echo " </children>" >> compositeArtifacts.xml
fi
echo "</repository>" >> compositeArtifacts.xml
echo "<?xml version='1.0' encoding='UTF-8'?>" >> compositeContent.xml
@@ -24,9 +32,16 @@ echo " type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMet
echo " <properties size='1'>" >> compositeContent.xml
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeContent.xml
echo " </properties>" >> compositeContent.xml
echo " <children size='1'>" >> compositeContent.xml
echo " <child location='${url}'/>" >> compositeContent.xml
echo " </children>" >> compositeContent.xml
if [ "${jusstj21}" = true ] ; then
echo " <children size='2'>" >> compositeContent.xml
echo " <child location='${url}'/>" >> compositeContent.xml
echo " <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeContent.xml
echo " </children>" >> compositeContent.xml
else
echo " <children size='1'>" >> compositeContent.xml
echo " <child location='${url}'/>" >> compositeContent.xml
echo " </children>" >> compositeContent.xml
fi
echo "</repository>" >> compositeContent.xml
echo "version=1" >> p2.index

40
.github/workflows/aggregate-distro-update-sites.yml vendored
View File

@@ -52,27 +52,31 @@ jobs:
echo "Found ${dir}"
dir_name=${dir:0:-1}
site_url="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}"
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url
if [[ ${dir_name} == "e4.32" ]]; then
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url true
else
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url
fi
cat ./compositeArtifacts.xml
cat ./compositeContent.xml
if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
aws s3 cp ./compositeArtifacts.xml s3://tools-spring-io/release/TOOLS/sts4/update/latest/
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
aws s3 cp ./compositeContent.xml s3://tools-spring-io/release/TOOLS/sts4/update/latest/
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/compositeContent.xml "
aws s3 cp ./p2.index s3://tools-spring-io/release/TOOLS/sts4/update/latest/
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/p2.index "
echo "TODO: Purge Cache"
fi
aws s3 mv ./compositeArtifacts.xml s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
aws s3 mv ./compositeContent.xml s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
aws s3 mv ./p2.index s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/p2.index "
# if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
# aws s3 cp ./compositeArtifacts.xml s3://tools-spring-io/release/TOOLS/sts4/update/latest/
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
# aws s3 cp ./compositeContent.xml s3://tools-spring-io/release/TOOLS/sts4/update/latest/
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/compositeContent.xml "
# aws s3 cp ./p2.index s3://tools-spring-io/release/TOOLS/sts4/update/latest/
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/latest/p2.index "
# echo "TODO: Purge Cache"
# fi
# aws s3 mv ./compositeArtifacts.xml s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
# aws s3 mv ./compositeContent.xml s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
# aws s3 mv ./p2.index s3://tools-spring-io/release/TOOLS/sts4/update/${dir}
# invalid_urls+="https://cdn.spring.io/spring-tools/release/TOOLS/sts4/update/${dir_name}/p2.index "
fi
done
echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
# done
# echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
purge_cache:
needs: [ update-aggregate-update-sites ]