Skip to content

Commit f720326

Browse files
BoykoAlexBoykoAlex
committed
Include new orbit for e436 aggregate update site
1 parent ee1fc74 commit f720326

File tree

2 files changed

+27
-33
lines changed

2 files changed

+27
-33
lines changed

‎.github/scripts/generate-composite-site-files.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
val=$1
22
url=$2
3-
justj21=$3
4-
5-
echo "Include JustJ bit: ${justj21}"
3+
eversion=$3
64

75
rm -f ./compositeArtifacts.xml
86
rm -f ./compositeContent.xml
@@ -15,10 +13,10 @@ echo " type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArt
1513
echo " <properties size='1'>" >> compositeArtifacts.xml
1614
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeArtifacts.xml
1715
echo " </properties>" >> compositeArtifacts.xml
18-
if [ "${justj21}" = true ] ; then
16+
if [[ ${eversion} == "e4.36" ]]; then
1917
echo " <children size='2'>" >> compositeArtifacts.xml
2018
echo " <child location='${url}'/>" >> compositeArtifacts.xml
21-
echo " <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeArtifacts.xml
19+
echo " <child location='https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/'/>" >> compositeArtifacts.xml
2220
echo " </children>" >> compositeArtifacts.xml
2321
else
2422
echo " <children size='1'>" >> compositeArtifacts.xml
@@ -34,10 +32,10 @@ echo " type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMet
3432
echo " <properties size='1'>" >> compositeContent.xml
3533
echo " <property name='p2.timestamp' value='${val}'/>" >> compositeContent.xml
3634
echo " </properties>" >> compositeContent.xml
37-
if [ "${justj21}" = true ] ; then
35+
if [[ ${eversion} == "e4.36" ]]; then
3836
echo " <children size='2'>" >> compositeContent.xml
3937
echo " <child location='${url}'/>" >> compositeContent.xml
40-
echo " <child location='https://download.eclipse.org/justj/jres/21/updates/release/latest/'/>" >> compositeContent.xml
38+
echo " <child location='https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06/'/>" >> compositeContent.xml
4139
echo " </children>" >> compositeContent.xml
4240
else
4341
echo " <children size='1'>" >> compositeContent.xml

‎.github/workflows/aggregate-distro-update-sites.yml

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,31 @@ jobs:
6161
echo "Found ${dir}"
6262
dir_name=${dir:0:-1}
6363
site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}"
64-
if [[ ${dir_name} == "e4.30" ]]; then
65-
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url
66-
else
67-
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url true
68-
fi
64+
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url $dir_name
6965
cat ./compositeArtifacts.xml
7066
cat ./compositeContent.xml
71-
if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
72-
aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
73-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
74-
aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
75-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
76-
aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
77-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
78-
echo "TODO: Purge Cache"
79-
fi
80-
aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
81-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
82-
aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
83-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
84-
aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
85-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
67+
# if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
68+
# aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
69+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
70+
# aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
71+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
72+
# aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
73+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
74+
# echo "TODO: Purge Cache"
75+
# fi
76+
# aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
77+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
78+
# aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
79+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
80+
# aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
81+
# invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
8682
fi
8783
done
8884
echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
89-
- uses: ./.github/actions/cloudflare-purge
90-
name: Invalidate URLs
91-
with:
92-
urls: ${{ steps.gen-aggregate-sites.outputs.invalid_urls }}
93-
cloudflare_zone_id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
94-
cloudflare_cache_token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
85+
# - uses: ./.github/actions/cloudflare-purge
86+
# name: Invalidate URLs
87+
# with:
88+
# urls: ${{ steps.gen-aggregate-sites.outputs.invalid_urls }}
89+
# cloudflare_zone_id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
90+
# cloudflare_cache_token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
9591

0 commit comments

Comments
 (0)