From 657a255f97d1e047bee0ab7b6daca60cb5014753 Mon Sep 17 00:00:00 2001 From: aboyko Date: Sun, 30 Jul 2023 13:56:35 -0400 Subject: [PATCH] Corrections to preparation for eclipse distro release build --- .github/workflows/eclipse-ls-extensions-build.yml | 4 ++-- .github/workflows/gh-hosted-eclipse-distro-build.yml | 2 +- .github/workflows/release-eclipse-build.yml | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index a83be3d2b..9ad3b71c6 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -74,9 +74,9 @@ jobs: fi cd eclipse-language-servers if command -v xvfb-run ; then - xvfb-run ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} ${sts4_ls_version_param} -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore + xvfb-run ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore else - ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} ${sts4_ls_version_param} -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore + ./mvnw --batch-mode clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dsigning.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Ds3service.https-only=true -Dtycho.localArtifacts=ignore fi - name: Verify Eclipse LS Extensions on e429 run: | diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 3bbdef0c0..c533efffc 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -68,7 +68,7 @@ jobs: p2_qualifier_param="-Dp2.qualifier=${p2_qualifier}" fi cd eclipse-distribution - ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} ${sts4_ls_version_param} ${p2_qualifier_param} -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=true -Dskip.win.signing=true -Dskip.osx.notarizing=true -Dtycho.equinox.resolver.uses=true + ./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -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=true -Dskip.win.signing=true -Dskip.osx.notarizing=true -Dtycho.equinox.resolver.uses=true - name: Upload Linux Distro Build Artifacts env: AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }} diff --git a/.github/workflows/release-eclipse-build.yml b/.github/workflows/release-eclipse-build.yml index 541363542..04014b05b 100644 --- a/.github/workflows/release-eclipse-build.yml +++ b/.github/workflows/release-eclipse-build.yml @@ -22,6 +22,8 @@ jobs: skip_tests: true sts4-language-servers-version: ${{ steps.timestamp.outputs.date }} secrets: inherit + outputs: + sts4-language-servers-version: ${{ steps.timestamp.outputs.date }} e427-distro: runs-on: ubuntu-latest @@ -32,7 +34,7 @@ jobs: eclipse_profile: 'e427' build_type: 'release' p2-qualifier: 'RELEASE' - sts4-language-servers-version: ${{ jobs.eclipse-ls-extension.steps.timestamp.outputs.date }} + sts4-language-servers-version: ${{ needs.eclipse-ls-extension.outputs.sts4-language-servers-version }} e428-distro: runs-on: ubuntu-latest @@ -43,7 +45,7 @@ jobs: eclipse_profile: 'e428' build_type: 'release' p2-qualifier: 'RELEASE' - sts4-language-servers-version: ${{ jobs.eclipse-ls-extension.steps.timestamp.outputs.date }} + sts4-language-servers-version: ${{ needs.eclipse-ls-extension.outputs.sts4-language-servers-version }} e429-distro: runs-on: ubuntu-latest @@ -54,4 +56,4 @@ jobs: eclipse_profile: 'e429' build_type: 'release' p2-qualifier: 'RELEASE' - sts4-language-servers-version: ${{ jobs.eclipse-ls-extension.steps.timestamp.outputs.date }} + sts4-language-servers-version: ${{ needs.eclipse-ls-extension.outputs.sts4-language-servers-version }}