From a1c7f3e21e1f67ab322d604b93329027f3039565 Mon Sep 17 00:00:00 2001 From: Louis Bompart Date: Thu, 26 Oct 2023 22:54:12 -0400 Subject: [PATCH 1/2] uniform casing reeeeeeeeee --- .github/workflows/release.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5f425306f..735d7d5b9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,11 +149,12 @@ jobs: - name: Find modified Snapshots id: snapshots-path run: | + git diff --name-only **/*.snap { - echo "snapshotsPath<> "$GITHUB_ENV" + } >> "$GITHUB_OUTPUT" - name: Upload Jest Snapshots if: ${{ env.snapshotsPath != ''}} uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3 @@ -279,7 +280,7 @@ jobs: - name: Get CLI version run: | { - printf "cliVersion=" + printf "CLI_VERSION=" cat packages/cli/core/package.json | jq -r '.version' } >> "$GITHUB_ENV" - name: Build @@ -317,19 +318,19 @@ jobs: New-Item -Force -ItemType directory -Path tmp echo "${{ secrets.COVEO_PFX }}" > ./tmp/cert.txt certutil -decode ./tmp/cert.txt ./tmp/cert.pfx - Start-Process -FilePath "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" -ArgumentList "sign /f ./tmp/cert.pfx /p ${{ secrets.COVEO_PFX_PWD }} /fd SHA256 /tr http://timestamp.digicert.com /td SHA256 ./dist/win32/coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64.exe" -PassThru | Wait-Process - Start-Process -FilePath "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" -ArgumentList "sign /f ./tmp/cert.pfx /p ${{ secrets.COVEO_PFX_PWD }} /fd SHA256 /tr http://timestamp.digicert.com /td SHA256 ./dist/win32/coveo-${{env.cliversion}}-${{env.commitSHA1}}-x86.exe" -PassThru | Wait-Process + Start-Process -FilePath "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" -ArgumentList "sign /f ./tmp/cert.pfx /p ${{ secrets.COVEO_PFX_PWD }} /fd SHA256 /tr http://timestamp.digicert.com /td SHA256 ./dist/win32/coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64.exe" -PassThru | Wait-Process + Start-Process -FilePath "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" -ArgumentList "sign /f ./tmp/cert.pfx /p ${{ secrets.COVEO_PFX_PWD }} /fd SHA256 /tr http://timestamp.digicert.com /td SHA256 ./dist/win32/coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x86.exe" -PassThru | Wait-Process - name: Sign Executable (macOS) working-directory: ./packages/cli/core/dist/macos if: ${{matrix.os == 'macos-latest'}} run: | echo "Signing for ARM64 architecture" security unlock-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain - productsign --sign $MACOS_WWDR_TEAM_ID coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64.pkg coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64-signed.pkg --keychain build.keychain + productsign --sign $MACOS_WWDR_TEAM_ID coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64.pkg coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64-signed.pkg --keychain build.keychain echo "Signing for X64 architecture" security unlock-keychain -p "$MACOS_KEYCHAIN_PWD" build.keychain - productsign --sign $MACOS_WWDR_TEAM_ID coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64.pkg coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64-signed.pkg --keychain build.keychain + productsign --sign $MACOS_WWDR_TEAM_ID coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64.pkg coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64-signed.pkg --keychain build.keychain - name: Notarize Executable (macOS) working-directory: ./packages/cli/core/dist/macos if: ${{matrix.os == 'macos-latest'}} @@ -341,20 +342,20 @@ jobs: xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.MACOS_APP_USERNAME }}" --team-id "${{ secrets.MACOS_WWDR_TEAM_ID }}" --password "${{ secrets.MACOS_APP_SPECIFIC_PWD }}" echo "Creating temp notarization archive" - ditto -c -k --keepParent "coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64-signed.pkg" "notarization-arm64.zip" - ditto -c -k --keepParent "coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64-signed.pkg" "notarization-x64.zip" + ditto -c -k --keepParent "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64-signed.pkg" "notarization-arm64.zip" + ditto -c -k --keepParent "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64-signed.pkg" "notarization-x64.zip" echo "Notarizing app" xcrun notarytool submit "notarization-arm64.zip" --keychain-profile "notarytool-profile" --wait xcrun notarytool submit "notarization-x64.zip" --keychain-profile "notarytool-profile" --wait echo "Attaching staple" - xcrun stapler staple "coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64-signed.pkg" - xcrun stapler staple "coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64-signed.pkg" + xcrun stapler staple "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64-signed.pkg" + xcrun stapler staple "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64-signed.pkg" echo "Deleting unsigned packages" - mv "coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64-signed.pkg" "coveo-${{env.cliversion}}-${{env.commitSHA1}}-x64.pkg" - mv "coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64-signed.pkg" "coveo-${{env.cliversion}}-${{env.commitSHA1}}-arm64.pkg" + mv "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64-signed.pkg" "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-x64.pkg" + mv "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64-signed.pkg" "coveo-${{env.CLI_VERSION}}-${{env.commitSHA1}}-arm64.pkg" rm notarization-arm64.zip notarization-x64.zip - name: Upload binaries uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3 From f087e5cf0967c6f41cf3c4f0b1c7acd98742041c Mon Sep 17 00:00:00 2001 From: Louis Bompart Date: Thu, 26 Oct 2023 23:02:03 -0400 Subject: [PATCH 2/2] run on ut, forgot'em last time --- .github/workflows/release.yml | 44 +++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 735d7d5b9d..a1faa7b805 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,7 +149,6 @@ jobs: - name: Find modified Snapshots id: snapshots-path run: | - git diff --name-only **/*.snap { echo 'snapshotsPath<> "$GITHUB_OUTPUT" + - name: Upload Jest Snapshots + if: ${{ env.snapshotsPath != ''}} + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3 + with: + name: release-e2e-snaps + path: ${{ env.snapshotsPath }} release-git: - needs: [e2e, release-npm] + needs: [e2e, release-npm, unit-tests] environment: 'Release' runs-on: ubuntu-20.04 env: