diff --git a/.github/scripts/clear-s3-caches-file.sh b/.github/scripts/clear-s3-caches-file.sh deleted file mode 100755 index 41abe0dbe..000000000 --- a/.github/scripts/clear-s3-caches-file.sh +++ /dev/null @@ -1,27 +0,0 @@ -set -e - -file=$1 -echo "Clearing S3 caches for file: ${file}" - -#Flush AWS Cloudfront Cache -invalidation_json=`aws cloudfront create-invalidation --distribution-id ECAO9Q8651L8M --output json --paths "/${file}"` -echo "Invalidation response: ${invalidation_json}" -invalidation_id=`echo $invalidation_json | jq -r '.Invalidation.Id'` -invalidation_status=`echo $invalidation_json | jq -r '.Invalidation.Status'` -echo "ID=${invalidation_id} Status=${invalidation_status}" -while [ "${invalidation_status}" == "InProgress" ] -do - echo "Invalidation status: ${invalidation_status}" - sleep 3 - invalidation_status=`aws cloudfront get-invalidation --distribution-id ECAO9Q8651L8M --id $invalidation_id --output json | jq -r '.Invalidation.Status'` -done -echo "Final invalidation status: ${invalidation_status}" - -# Flush CloudFlare Cache -curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \ - -H "X-Auth-Email: spring-sysadmin@pivotal.io" \ - -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \ - -H "Content-Type: application/json" \ - --data "{\"files\": [ \"http://dist.springsource.com/${file}\" ] }" - - diff --git a/.github/scripts/clear-s3-caches.sh b/.github/scripts/clear-s3-caches.sh deleted file mode 100755 index 4879c445a..000000000 --- a/.github/scripts/clear-s3-caches.sh +++ /dev/null @@ -1,64 +0,0 @@ -set -e - -s3_path=$1 - -echo "Clearing S3 caches for path: ${s3_path}" - -#Flush AWS Cloudfront Cache -invalidation_json=`aws cloudfront create-invalidation --distribution-id ECAO9Q8651L8M --output json --paths "/${s3_path}/*"` -echo "Invalidation response: ${invalidation_json}" -invalidation_id=`echo $invalidation_json | jq -r '.Invalidation.Id'` -invalidation_status=`echo $invalidation_json | jq -r '.Invalidation.Status'` -echo "ID=${invalidation_id} Status=${invalidation_status}" -while [ "${invalidation_status}" == "InProgress" ] -do - echo "Invalidation status: ${invalidation_status}" - sleep 3 - invalidation_status=`aws cloudfront get-invalidation --distribution-id ECAO9Q8651L8M --id $invalidation_id --output json | jq -r '.Invalidation.Status'` -done -echo "Final invalidation status: ${invalidation_status}" - -# Flush CloudFlare Cache -s3_url=s3://dist.springsource.com/${s3_path} -files=`aws s3 cp ${s3_url} . --recursive --include "*" --dryrun` -counter=0 -json="" -NL=$'\n' -FILES_BATCH=7 -for file in $files -do - if [[ "$counter" -eq 0 ]]; then - json="{\"files\": [${NL}" - fi - if [[ "$file" =~ ^"s3://dist.springsource.com" ]]; then - echo "Processing ${file}" - counter=$((counter+1)) - path=${file:26} - json="${json}\"http://dist.springsource.com${path}\",${NL}\"https://dist.springsource.com${path}\",${NL}\"http://download.springsource.com${path}\",${NL}\"https://download.springsource.com${path}\",${NL}" - fi - if [[ "$counter" -eq "$FILES_BATCH" ]]; then - json="${json%,*}${NL}]}" - echo $json - - curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \ - -H "X-Auth-Email: spring-sysadmin@pivotal.io" \ - -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \ - -H "Content-Type: application/json" \ - --data "${json}" - - json="" - counter=0 - fi -done -if ! [[ "$counter" -eq 0 ]]; then - json="${json%,*}${NL}]}" - echo $json - - curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \ - -H "X-Auth-Email: spring-sysadmin@pivotal.io" \ - -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \ - -H "Content-Type: application/json" \ - --data "${json}" -fi - - diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh index 9f50ff81e..67807e600 100755 --- a/.github/scripts/update-distro-download-page.sh +++ b/.github/scripts/update-distro-download-page.sh @@ -4,24 +4,6 @@ dist_path=$1 eclipse_version=$2 build_type=$3 -# Legacy S3 tool-spring-io dist.springsource.com -s3_url=s3://dist.springsource.com/${dist_path} -downloads_html="sts4-nightly-${eclipse_version}.html" -files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` -rm -f ./${downloads_html} -echo '' >> $downloads_html -cat ./$downloads_html -aws s3 mv ./$downloads_html s3://dist.springsource.com/${build_type}/STS4/ --acl public-read --no-progress - # Akamai tools-spring-io bucket s3_url=s3://tools-spring-io/${dist_path} downloads_html="sts4-nightly-${eclipse_version}.html" diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml index f41824def..b503f5309 100644 --- a/.github/workflows/aggregate-distro-update-sites.yml +++ b/.github/workflows/aggregate-distro-update-sites.yml @@ -42,30 +42,6 @@ jobs: CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} run: | - echo "Old S3 Aggregate Update Sites Creation..." - dirs=`aws s3 ls s3://dist.springsource.com/release/TOOLS/sts4/update/${{ inputs.version }}/` - pattern='^e[0-9]+.[0-9]+/$' - for dir in $dirs - do - if [[ "$dir" =~ $pattern ]]; then - echo "Found ${dir}" - dir_name=${dir:0:-1} - site_url="https://download.springsource.com/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}" - ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url - cat ./compositeArtifacts.xml - cat ./compositeContent.xml - if [[ ${dir_name} == ${{ inputs.latest }} ]]; then - aws s3 cp ./compositeArtifacts.xml s3://dist.springsource.com/release/TOOLS/sts4/update/latest/ --acl public-read - aws s3 cp ./compositeContent.xml s3://dist.springsource.com/release/TOOLS/sts4/update/latest/ --acl public-read - aws s3 cp ./p2.index s3://dist.springsource.com/release/TOOLS/sts4/update/latest/ --acl public-read - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh release/TOOLS/sts4/update/latest - fi - aws s3 mv ./compositeArtifacts.xml s3://dist.springsource.com/release/TOOLS/sts4/update/${dir} --acl public-read - aws s3 mv ./compositeContent.xml s3://dist.springsource.com/release/TOOLS/sts4/update/${dir} --acl public-read - aws s3 mv ./p2.index s3://dist.springsource.com/release/TOOLS/sts4/update/${dir} --acl public-read - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh release/TOOLS/sts4/update/${dir_name} - fi - done echo "Akamai S3 Aggregate Update Sites Creation..." dirs=`aws s3 ls s3://tools-spring-io/release/TOOLS/sts4/update/${{ inputs.version }}/` pattern='^e[0-9]+.[0-9]+/$' diff --git a/.github/workflows/aggregate-ls-extensions-update-site.yml b/.github/workflows/aggregate-ls-extensions-update-site.yml index 8cff4af9c..8a0f3442a 100644 --- a/.github/workflows/aggregate-ls-extensions-update-site.yml +++ b/.github/workflows/aggregate-ls-extensions-update-site.yml @@ -38,15 +38,6 @@ jobs: CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} run: | - echo "Old S3 Aggregate Update Sites Creation..." - site_url="https://download.springsource.com/release/TOOLS/sts4-language-server-integrations/${{ inputs.version }}" - ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url - cat ./compositeArtifacts.xml - cat ./compositeContent.xml - aws s3 cp ./compositeArtifacts.xml s3://dist.springsource.com/release/TOOLS/sts4-language-server-integrations/ --acl public-read - aws s3 cp ./compositeContent.xml s3://dist.springsource.com/release/TOOLS/sts4-language-server-integrations/ --acl public-read - aws s3 cp ./p2.index s3://dist.springsource.com/release/TOOLS/sts4-language-server-integrations/ --acl public-read - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh release/TOOLS/sts4-language-server-integrations echo "Akamai S3 Aggregate Update Sites Creation..." invalid_urls="" site_url="https://cdn.spring.io/spring-tools/release/TOOLS/sts4-language-server-integrations/${{ inputs.version }}" diff --git a/.github/workflows/clear_s3_cache.yml b/.github/workflows/clear_s3_cache.yml deleted file mode 100644 index 5ba7d9230..000000000 --- a/.github/workflows/clear_s3_cache.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Clear S3 Cache for path - -on: - workflow_dispatch: - inputs: - path: - description: Path in the S3 bucket dist.springsource.com without leading slash - required: true - type: string - -jobs: - - clear-s3-cache: - runs-on: macos-latest - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - with: - ref: ${{ inputs.ref }} - sparse-checkout: | - .github - - name: Cloudgate S3 Configuration - uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a - with: - aws-access-key-id: ${{ secrets.TOOLS_CLOUDGATE_ACCESS_KEY }} - aws-secret-access-key: ${{ secrets.TOOLS_CLOUDGATE_SECRET_KEY }} - role-to-assume: arn:aws:iam::${{ secrets.TOOLS_CLOUDGATE_ACCOUNT_ID }}:role/${{ secrets.TOOLS_CLOUDGATE_USER }} - role-session-name: ${{ github.run_id }} - aws-region: us-east-1 - role-duration-seconds: 900 - role-skip-session-tagging: true - - name: Invalidate S3 Cloudfront Cache - env: - CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} - CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} - run: | - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh ${{ inputs.path }} diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index f749ddda0..81c753a75 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -97,8 +97,6 @@ jobs: echo "P2 path: ${p2_path}" aws s3 rm s3://tools-spring-io/${p2_path}/ --recursive aws s3 cp ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/ s3://tools-spring-io/${p2_path}/ --recursive --no-progress - aws s3 rm s3://dist.springsource.com/${p2_path}/ --recursive - aws s3 cp ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/repository/ s3://dist.springsource.com/${p2_path}/ --recursive --acl public-read --no-progress # - name: Verify Uploaded P2 Repo # id: verify-p2-on-akamai # run: | @@ -115,13 +113,6 @@ jobs: run: | invalid_urls=`aws s3 ls s3://tools-spring-io/${{ steps.upload-p2-to-akamai.outputs.p2_path }}/ --recursive | awk '{$1=$2=$3=""; print $0}' | sed -e 's/^[ \t]*/https:\/\/cdn.spring.io\/spring-tools\//' | paste -sd' ' -` echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT - - name: Clear S3 Caches - if: ${{ inputs.build_type != 'snapshot' }} - env: - CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} - CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} - run: | - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh ${{ steps.upload-p2-to-akamai.outputs.p2_path }} - name: Verify Eclipse LS Extensions on e431 if: ${{ inputs.build_type == 'snapshot' }} run: | diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 798d5ab88..5f35be3cd 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -118,8 +118,6 @@ jobs: cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target p2_path=${{ steps.s3-paths.outputs.p2_path }} echo "P2 path: ${p2_path}" - aws s3 rm s3://dist.springsource.com/$p2_path/ --recursive - aws s3 cp ./repository/ s3://dist.springsource.com/$p2_path/ --recursive --acl public-read --no-progress aws s3 rm s3://tools-spring-io/$p2_path/ --recursive aws s3 cp ./repository/ s3://tools-spring-io/$p2_path/ --recursive --no-progress - name: Store TCP Dump @@ -152,10 +150,6 @@ jobs: echo "Processing S3 update..." dist_path=${{ steps.s3-paths.outputs.dist_path }} ls spring-tool-suite-4*linux*.tar.gz* - echo "Removing old Linux .tar.gz files from s3..." - aws s3 rm s3://dist.springsource.com/$dist_path --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" - echo "Uploading new Linux .tar.gz files to s3..." - aws s3 cp . s3://dist.springsource.com/$dist_path --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" --acl public-read --no-progress echo "Removing old Linux .tar.gz files from Akamai s3..." aws s3 rm s3://tools-spring-io/$dist_path --recursive --exclude "*" --include "spring-tool-suite-4*linux*.tar.gz*" --exclude "*/*" echo "Uploading new Linux .tar.gz files to Akamai s3..." @@ -219,10 +213,6 @@ jobs: echo "Processing S3 update..." ls spring-tool-suite-4*win*.zip* ls spring-tool-suite-4*win*.self-extracting.jar* - echo "Removing old win zip and self extracting jar files from s3..." - aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" - echo "Uploading new win zip and self extracting jar files to s3..." - aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --acl public-read --no-progress echo "Removing old win zip and self extracting jar files from Akamai..." aws s3 rm s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" echo "Uploading new win zip and self extracting jar files to Akamai..." @@ -330,10 +320,6 @@ jobs: dist_path=${{ needs.eclipse-distro-build.outputs.dist_path }} echo "Processing S3 update..." ls spring-tool-suite-4*macosx*.dmg* - echo "Removing old dmg files from s3..." - aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" - echo "Uploading new dmg files to s3..." - aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --acl public-read --no-progress echo "Removing old dmg files from Akamai..." aws s3 rm s3://tools-spring-io/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" echo "Uploading new dmg files to Akamai..." @@ -407,14 +393,6 @@ jobs: id: cleanup-s3-temp-storage run: | aws s3 rm s3://tools-spring-io/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ needs.eclipse-distro-build.outputs.id }}/*" - - name: Clear Legacy S3 Caches for Distros - if: ${{ inputs.build_type != 'snapshot' }} - env: - CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} - CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} - run: | - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh ${{ needs.eclipse-distro-build.outputs.dist_path }} - ${{ github.workspace }}/.github/scripts/clear-s3-caches.sh ${{ needs.eclipse-distro-build.outputs.p2_path }} notify-failure: needs: [ eclipse-distro-build, sign-win-distros, sign-osx-distros, cleanup, purge_cache ] diff --git a/.github/workflows/self-hosted-eclipse-distro-build.yml b/.github/workflows/self-hosted-eclipse-distro-build.yml deleted file mode 100644 index d6df92882..000000000 --- a/.github/workflows/self-hosted-eclipse-distro-build.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: Eclipse Distro STS Build (Self Hosted) - -on: - workflow_dispatch: - inputs: - eclipse_profile: - description: Eclipse profile 'e429' etc - required: true - default: 'e429' - type: string - build_type: - description: Build type such as 'snapshot', 'milestone' or 'release' - required: true - default: 'snapshot' - type: string - ref: - description: Git branch, tag, commit hash - required: false - default: 'main' - type: string - -jobs: - - eclipse-distro-build: - runs-on: [self-hosted, macOS] - steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - with: - ref: ${{ inputs.ref }} - sparse-checkout: | - .github - eclipse-distribution - eclipse-extensions - - name: Set up JDK 17 - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 - with: - java-version: '17' - distribution: 'temurin' - - name: Enforce https instead of http - run: ./nohttp.sh - - name: Install GPG key - run: | - echo "${{ secrets.GPG_PRIVATE_KEY }}" > gpg.asc - echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --import gpg.asc - - name: Unlock login keychain for OSX signing - run: | - security unlock-keychain -p ${{ secrets.KEYCHAIN_PASSWORD }} /Users/runner/Library/Keychains/login.keychain-db - - name: Create Temp Directory Structure for Notarization Service - run: | - cd /tmp - mkdir -p macos-notarization-service/pending-files - - name: Build Eclipse Distro - env: - tools_s3_access_key: ${{ secrets.TOOLS_S3_ACCESS_KEY }} - tools_s3_secret_key: ${{ secrets.TOOLS_S3_SECRET_KEY }} - gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} - gpg_keyname: ${{ secrets.GPG_KEYID }} - MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }} - KEYCHAIN: /Users/runner/Library/Keychains/login.keychain-db - MACOS_NOTARIZATION_SERVICE_URL: http://localhost:8080 - AC_USERNAME: ${{ secrets.AC_USERNAME }} - AC_PASSWORD: ${{ secrets.AC_PASSWORD }} - APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - run: | - cd eclipse-distribution - ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=false -Dskip.win.signing=false -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true - - name: Sign EXE within zip files - id: sign - env: - SSH_KEY: ~/.ssh/id_rsa - SSH_USER: signer - run: | - cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products - files=`ls spring-tool-suite-4*win*.zip` - for file in $files - do - ${{ github.workspace }}/.github/scripts/sign-exe-in-zip-file.sh $file ${{ github.workspace }}/.github/scripts/sign-exe.sh ${{ github.workspace }}/.github/scripts/self-extracting-jar-creator.jar - done - - name: Update Win zip/jar on S3 - id: update-s3 - env: - AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY }} - run: | - dist_path=`cat ./eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-dist-path.txt` - cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products - echo "Processing S3 update..." - ls spring-tool-suite-4*win*.zip* - ls spring-tool-suite-4*win*.self-extracting.jar* - echo "Removing old win zip and self extracting jar files from s3..." - aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar* --exclude "*/*"" - echo "Uploading new win zip and self extracting jar files to s3..." - aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --acl public-read --no-progress diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml index 3dc846db5..8178e0557 100644 --- a/.github/workflows/upload-nightly-downloads-page.yml +++ b/.github/workflows/upload-nightly-downloads-page.yml @@ -33,13 +33,5 @@ jobs: run: | echo "Removing old nightly-distributions.html from s3..." aws s3 rm s3://tools-spring-io/snapshot/STS4/nightly-distributions.html - aws s3 rm s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html echo "Uploading new nightly-distributions.html to s3..." - aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --acl public-read --no-progress aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://tools-spring-io/snapshot/STS4/nightly-distributions.html --no-progress - - name: Invalidate S3 Cloudfront Cache - env: - CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} - CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} - run: | - ${{ github.workspace }}/.github/scripts/clear-s3-caches-file.sh snapshot/STS4/nightly-distributions.html diff --git a/.github/workflows/wipe-out-temp-build-artifacts.yml b/.github/workflows/wipe-out-temp-build-artifacts.yml index 1c02075ca..2187bcfb3 100644 --- a/.github/workflows/wipe-out-temp-build-artifacts.yml +++ b/.github/workflows/wipe-out-temp-build-artifacts.yml @@ -25,5 +25,5 @@ jobs: - name: Remove Temp Build Artifacts from S3 id: cleanup-s3-temp-storage run: | - aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "*.zip" + aws s3 rm s3://tools-spring-io/sts4-distro-ci-temp --recursive --exclude "*" --include "*.zip" diff --git a/README-dev-env.md b/README-dev-env.md index 2a76b8cc0..25f447acc 100644 --- a/README-dev-env.md +++ b/README-dev-env.md @@ -54,12 +54,12 @@ This lets the Eclipse language server extension connect to the locally running l http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/ - There is an update site that contains our latest language servers as extensions for Eclipse: - https://dist.springsource.com/snapshot/TOOLS/sts4-language-server-integrations/nightly + https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4-language-server-integrations/nightly This is being produced by: https://build.spring.io/browse/IDE-CODE - CI builds of the full STS4 distribution can be downloaded from here: - https://dist.springsource.com/snapshot/STS4/nightly-distributions.html + https://cdn.spring.io/spring-tools/snapshot/STS4/nightly-distributions.html diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index d16ee1ace..046579e5e 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -168,42 +168,6 @@ resources: aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user)) region_name: ((s3_region)) regexp: sts4/vscode-extensions/snapshots/vscode-spring-cli-(.*).vsix -- name: s3-concourse-vsix-release - type: s3 - icon: content-save-outline - source: - bucket: dist.springsource.com - access_key_id: ((s3_svc_accesskey)) - secret_access_key: ((s3_svc_secretkey)) - aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user)) - regexp: release/STS4/vscode/vscode-concourse-(.*).vsix -- name: s3-bosh-vsix-release - type: s3 - icon: content-save-outline - source: - bucket: dist.springsource.com - access_key_id: ((s3_svc_accesskey)) - secret_access_key: ((s3_svc_secretkey)) - aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user)) - regexp: release/STS4/vscode/vscode-bosh-(.*).vsix -- name: s3-manifest-yaml-vsix-release - type: s3 - icon: content-save-outline - source: - bucket: dist.springsource.com - access_key_id: ((s3_svc_accesskey)) - secret_access_key: ((s3_svc_secretkey)) - aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user)) - regexp: release/STS4/vscode/vscode-manifest-yaml-(.*).vsix -- name: s3-spring-boot-vsix-release - type: s3 - icon: content-save-outline - source: - bucket: dist.springsource.com - access_key_id: ((s3_svc_accesskey)) - secret_access_key: ((s3_svc_secretkey)) - aws_role_arn: arn:aws:iam::((s3_svc_account_id)):role/((s3_svc_user)) - regexp: release/STS4/vscode/vscode-spring-boot-(.*).vsix - name: s3-concourse-vsix-release-akamai type: s3 icon: content-save-outline @@ -411,31 +375,15 @@ jobs: passed: - publish-release - in_parallel: - - put: s3-spring-boot-vsix-release - params: - file: s3-spring-boot-vsix-snapshot/*.vsix - acl: public-read - put: s3-spring-boot-vsix-release-akamai params: file: s3-spring-boot-vsix-snapshot/*.vsix - - put: s3-manifest-yaml-vsix-release - params: - file: s3-manifest-yaml-vsix-snapshot/*.vsix - acl: public-read - put: s3-manifest-yaml-vsix-release-akamai params: file: s3-manifest-yaml-vsix-snapshot/*.vsix - - put: s3-bosh-vsix-release - params: - file: s3-bosh-vsix-snapshot/*.vsix - acl: public-read - put: s3-bosh-vsix-release-akamai params: file: s3-bosh-vsix-snapshot/*.vsix - - put: s3-concourse-vsix-release - params: - file: s3-concourse-vsix-snapshot/*.vsix - acl: public-read - put: s3-concourse-vsix-release-akamai params: file: s3-concourse-vsix-snapshot/*.vsix diff --git a/concourse/tasks/create-release-wiki-page.sh b/concourse/tasks/create-release-wiki-page.sh index 48fe1764b..608fb7688 100755 --- a/concourse/tasks/create-release-wiki-page.sh +++ b/concourse/tasks/create-release-wiki-page.sh @@ -15,7 +15,7 @@ do # https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/vscode-extensions/snapshots/vscode-spring-boot-1.15.0-RC.1.vsix url=https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/vscode-extensions/snapshots/$fname else - url=https://dist.springsource.com/release/STS4/vscode/$fname + url=https://cdn.spring.io/spring-tools/release/STS4/vscode/$fname fi echo "- [$fname]($url)" >> $page done diff --git a/eclipse-distribution/common/html/nightly-generic-snippet-incl-apple-m1.html b/eclipse-distribution/common/html/nightly-generic-snippet-incl-apple-m1.html index b68f994ab..e3815cce5 100644 --- a/eclipse-distribution/common/html/nightly-generic-snippet-incl-apple-m1.html +++ b/eclipse-distribution/common/html/nightly-generic-snippet-incl-apple-m1.html @@ -1,10 +1,10 @@ diff --git a/eclipse-distribution/common/html/nightly-generic-snippet.html b/eclipse-distribution/common/html/nightly-generic-snippet.html index 8f8c976df..1ac70fea9 100644 --- a/eclipse-distribution/common/html/nightly-generic-snippet.html +++ b/eclipse-distribution/common/html/nightly-generic-snippet.html @@ -1,8 +1,8 @@ diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 97cc9ecdb..054402487 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -164,7 +164,7 @@ maven-extras-mirror p2 - https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ + https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/ maven-egit @@ -264,7 +264,7 @@ maven-extras-mirror p2 - https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ + https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/ maven-egit @@ -364,7 +364,7 @@ maven-extras-mirror p2 - https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/ + https://cdn.spring.io/spring-tools/release/TOOLS/third-party/m2e-sts310-signed/ maven-egit diff --git a/vscode-extensions/vscode-bosh/developer-notes.md b/vscode-extensions/vscode-bosh/developer-notes.md index 5b250b41d..429b2da1f 100644 --- a/vscode-extensions/vscode-bosh/developer-notes.md +++ b/vscode-extensions/vscode-bosh/developer-notes.md @@ -4,7 +4,7 @@ The latest snapshot .vsix file can be downloaded from here: -https://dist.springsource.com/snapshot/STS4/nightly-distributions.html +https://cdn.spring.io/spring-tools/snapshot/STS4/nightly-distributions.html You should get the file called `vscode-bosh-.vsix`. diff --git a/vscode-extensions/vscode-concourse/developer-notes.md b/vscode-extensions/vscode-concourse/developer-notes.md index bdc5c3323..1325e4acc 100644 --- a/vscode-extensions/vscode-concourse/developer-notes.md +++ b/vscode-extensions/vscode-concourse/developer-notes.md @@ -4,7 +4,7 @@ The latest snapshot .vsix file can be downloaded from here: -https://dist.springsource.com/snapshot/STS4/nightly-distributions.html +https://cdn.spring.io/spring-tools/snapshot/STS4/nightly-distributions.html You should get the file called `vscode-concourse-.vsix`. diff --git a/vscode-extensions/vscode-manifest-yaml/developer-notes.md b/vscode-extensions/vscode-manifest-yaml/developer-notes.md index b3b1dd6a9..725f7de48 100644 --- a/vscode-extensions/vscode-manifest-yaml/developer-notes.md +++ b/vscode-extensions/vscode-manifest-yaml/developer-notes.md @@ -4,7 +4,7 @@ The latest snapshot .vsix file can be downloaded from here: -https://dist.springsource.com/snapshot/STS4/nightly-distributions.html +https://cdn.spring.io/spring-tools/snapshot/STS4/nightly-distributions.html You should get the file called `vscode-manifest-yaml-.vsix`. diff --git a/vscode-extensions/vscode-spring-boot/README.md b/vscode-extensions/vscode-spring-boot/README.md index 387f31582..9bd73c3f6 100644 --- a/vscode-extensions/vscode-spring-boot/README.md +++ b/vscode-extensions/vscode-spring-boot/README.md @@ -129,7 +129,7 @@ Released versions of this extension can be installed directly from the vscode ma There are also development snapshots available with the latest fixes and improvements as a `.vsix` file that can be donwloaded from -[here](https://dist.springsource.com/snapshot/STS4/nightly-distributions.html). To install it +[here](https://cdn.spring.io/spring-tools/snapshot/STS4/nightly-distributions.html). To install it open vscode, press `CTRL-SHIFT-P` and search for VSIX, then select `Extension: Install from VSIX` [yaml-completion]: https://github.com/spring-projects/sts4/raw/5360ae4fabf9245da58f5897c54e9a14786d0622/vscode-extensions/vscode-boot-properties/readme-imgs/yaml-completion.png