From 236c6b7b237b80d7b6f07aea00f77252be93b0d8 Mon Sep 17 00:00:00 2001 From: aboyko Date: Sat, 7 Sep 2024 09:11:45 -0400 Subject: [PATCH] Correct signing inside rewrite-gradle.jar --- .github/scripts/sign-osx-distro-file.sh | 5 +-- .../workflows/eclipse-ls-extensions-build.yml | 35 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh index 9373eacfdf..e7abfff1d1 100755 --- a/.github/scripts/sign-osx-distro-file.sh +++ b/.github/scripts/sign-osx-distro-file.sh @@ -34,7 +34,8 @@ function signExecutableInsideJar() { rm -rf $extracted_jar_dir mkdir $extracted_jar_dir echo "Extracting archive ${f}" - unzip -q $f -d ./${extracted_jar_dir} + unzip -o -q $f -d ./${extracted_jar_dir} + echo "Extracted successfully" for jnilib_file in `find $extracted_jar_dir -type f | grep -E "$4"` do echo "Signing binary file: ${jnilib_file}" @@ -60,7 +61,7 @@ function signExecutableInsideNestedJar() { rm -rf $extracted_jar_dir mkdir $extracted_jar_dir echo "Extracting archive ${jar_file}" - unzip -q $jar_file -d ./${extracted_jar_dir} + unzip -o -q $jar_file -d ./${extracted_jar_dir} signExecutableInsideJar $extracted_jar_dir $3 $4 $5 cd $extracted_jar_dir zip -r -u ../$jar_file . diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index 8aa4f607f7..bbdd236432 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -111,6 +111,41 @@ jobs: else ./mvnw --batch-mode clean package -Pe433 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore fi + - name: GChat spring-tools-team notification + if: ${{ inputs.build_type == 'release' }} + run: | + cd eclipse-language-servers + current_version=`./mvnw help:evaluate -Dexpression="project.version" -q -DforceStdout` + version=${current_version%%-*} + + build_type=${{ inputs.build_type }} + build_type=${build_type^} + + curl --location --request POST '${{ secrets.TOOLS_TEAM_GCHAT_WEBHOOK_URL }}' \ + --header 'Content-Type: application/json' \ + --data-raw "{ + \"cards\": [ + { + \"header\": { + \"title\": \"${build_type} Eclipse LS Extensions ${version}\", + \"subtitle\": \"${{ inputs.sts4-language-servers-version }}\", + \"imageUrl\": \"https://avatars.githubusercontent.com/u/317776?s=48&v=4\", + }, + \"sections\": [ + { + \"widgets\": [ + { + \"keyValue\": { + \"topLabel\": \"P2 Update Site\", + \"content\": \"${DOWNLOAD_URL_ROOT}/${{ steps.upload-p2.outputs.p2_path }}\" + } + } + ] + } + ] + } + ] + }" notify-failure: needs: [ eclipse-language-servers-build ]