From 42f76f83af37287b91d68902d8c2f25502731d8b Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Wed, 22 Jan 2025 01:30:34 +0000 Subject: [PATCH 01/19] Update sign.yml for azure codesigning tests --- .github/workflows/sign.yml | 60 +++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 6cdc719a7b..c49ab0d1a5 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -93,28 +93,48 @@ jobs: run: | mkdir -p to_sign cp "setup_exe_files/${{ matrix.file }}" to_sign/ - - name: Upload unsigned artifact + # - name: Upload unsigned artifact + # id: upload-unsigned-artifact + # uses: actions/upload-artifact@v4 + # with: + # name: unsigned-artifact-${{ matrix.file }} + # path: to_sign/${{ matrix.file }} + + # - name: sign the file + # uses: signpath/github-action-submit-signing-request@v1 + # env: + # SIGNPATH_SIGNING_POLICY_SLUG: ${{ github.event.inputs.policy == 'Test' && vars.SIGNPATH_SIGNING_POLICY_SLUG_TEST || vars.SIGNPATH_SIGNING_POLICY_SLUG_RELEASE }} + # with: + # api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' + # organization-id: '${{ vars.SIGNPATH_ORGANIZATION_ID }}' + # project-slug: '${{ vars.SIGNPATH_PROJECT_SLUG }}' + # signing-policy-slug: '${{ env.SIGNPATH_SIGNING_POLICY_SLUG }}' + # github-artifact-id: "${{steps.upload-unsigned-artifact.outputs.artifact-id}}" + # wait-for-completion: true + # output-artifact-directory: 'application-signed' + - name: Azure Trusted Signing + uses: azure/trusted-signing-action@v0.3.16 + with: + azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} + azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} + azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} + endpoint: ${{ secrets.AZURE_ENDPOINT }} + trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }} + certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }} + + # Sign all exes inside the folder + files-folder: to_sign + files-folder-filter: exe + + # - name: Upload signed artifact + # uses: actions/upload-artifact@v4 + # with: + # name: signed-artifact-${{ matrix.file }} + # path: ./application-signed + # - name: Upload unsigned artifact + - name: Upload signed artifact id: upload-unsigned-artifact uses: actions/upload-artifact@v4 with: name: unsigned-artifact-${{ matrix.file }} path: to_sign/${{ matrix.file }} - - - name: sign the file - uses: signpath/github-action-submit-signing-request@v1 - env: - SIGNPATH_SIGNING_POLICY_SLUG: ${{ github.event.inputs.policy == 'Test' && vars.SIGNPATH_SIGNING_POLICY_SLUG_TEST || vars.SIGNPATH_SIGNING_POLICY_SLUG_RELEASE }} - with: - api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' - organization-id: '${{ vars.SIGNPATH_ORGANIZATION_ID }}' - project-slug: '${{ vars.SIGNPATH_PROJECT_SLUG }}' - signing-policy-slug: '${{ env.SIGNPATH_SIGNING_POLICY_SLUG }}' - github-artifact-id: "${{steps.upload-unsigned-artifact.outputs.artifact-id}}" - wait-for-completion: true - output-artifact-directory: 'application-signed' - - - name: Upload signed artifact - uses: actions/upload-artifact@v4 - with: - name: signed-artifact-${{ matrix.file }} - path: ./application-signed \ No newline at end of file From 4e5199761c87cd73c763257f41ddd020daac3432 Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Wed, 22 Jan 2025 01:38:21 +0000 Subject: [PATCH 02/19] apparently the param name changed --- .github/workflows/sign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index c49ab0d1a5..0c5d45c3a3 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -119,7 +119,7 @@ jobs: azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} endpoint: ${{ secrets.AZURE_ENDPOINT }} - trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }} + code-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }} certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }} # Sign all exes inside the folder From fb25a8cead9cafba809071b1158bf0ede4a5b1aa Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Wed, 22 Jan 2025 01:45:19 +0000 Subject: [PATCH 03/19] update to more recent version of signing action --- .github/workflows/sign.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 0c5d45c3a3..59c29e834f 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -113,13 +113,13 @@ jobs: # wait-for-completion: true # output-artifact-directory: 'application-signed' - name: Azure Trusted Signing - uses: azure/trusted-signing-action@v0.3.16 + uses: azure/trusted-signing-action@v0.5.1 with: azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} endpoint: ${{ secrets.AZURE_ENDPOINT }} - code-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }} + trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }} certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }} # Sign all exes inside the folder From cd8482bd7419308720aafb156d825eacabf76469 Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Wed, 22 Jan 2025 01:59:36 +0000 Subject: [PATCH 04/19] Update sign.yml for windows runner --- .github/workflows/sign.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 59c29e834f..7a7394afee 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -6,14 +6,14 @@ on: build_run_number: description: 'GitHub Run Number (per build_viewer.yml workflow)' required: true - policy: - description: 'Policy to sign binaries' - required: true - type: choice - default: "Test" - options: - - "Test" - - "Release" + # policy: + # description: 'Policy to sign binaries' + # required: true + # type: choice + # default: "Test" + # options: + # - "Test" + # - "Release" # viewer_version: # description: 'viewer version not including build' # required: true @@ -33,7 +33,7 @@ on: jobs: find-setup-files: - runs-on: ubuntu-latest + runs-on: windows-latest permissions: actions: read contents: read @@ -83,6 +83,7 @@ jobs: curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ -H "Accept: application/vnd.github.v3+json" \ https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts + shell: bash - name: Download Setup.exe Files Artifact uses: actions/download-artifact@v4 @@ -93,6 +94,7 @@ jobs: run: | mkdir -p to_sign cp "setup_exe_files/${{ matrix.file }}" to_sign/ + shell: bash # - name: Upload unsigned artifact # id: upload-unsigned-artifact # uses: actions/upload-artifact@v4 @@ -123,7 +125,7 @@ jobs: certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }} # Sign all exes inside the folder - files-folder: to_sign + files-folder: ${{ github.workspace }}\to_sign files-folder-filter: exe # - name: Upload signed artifact @@ -137,4 +139,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: unsigned-artifact-${{ matrix.file }} - path: to_sign/${{ matrix.file }} + path: to_sign\${{ matrix.file }} From a48475d221e5677106b411d74538a401a613828d Mon Sep 17 00:00:00 2001 From: Beq Janus Date: Wed, 22 Jan 2025 02:06:24 +0000 Subject: [PATCH 05/19] both jobs need to be windows --- .github/workflows/sign.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index 7a7394afee..6d98335165 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -69,7 +69,7 @@ jobs: sign-and-upload: name: Sign and Upload each Setup.exe needs: find-setup-files - runs-on: ubuntu-latest + runs-on: windows-latest strategy: matrix: file: ${{ fromJson( needs.find-setup-files.outputs.setup_files) }} From c998047f14e9cc246d8c71490d2677898c5a1202 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Thu, 23 Jan 2025 13:00:31 +0100 Subject: [PATCH 06/19] FIRE-35082 French translation update, by Laurent Bechir --- .../skins/default/xui/fr/floater_fs_poser.xml | 9 +++++---- .../xui/fr/floater_inventory_view_finder.xml | 6 ++++++ .../default/xui/fr/menu_fs_poser_poses_btn.xml | 11 ++++------- .../xui/fr/menu_inventory_gear_default.xml | 2 +- .../default/xui/fr/panel_main_inventory.xml | 4 ++++ .../default/xui/fr/panel_preferences_UI.xml | 12 ++++++++++++ .../default/xui/fr/panel_preferences_colors.xml | 17 +++++++++-------- 7 files changed, 41 insertions(+), 20 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_fs_poser.xml b/indra/newview/skins/default/xui/fr/floater_fs_poser.xml index 112be594ea..c49cab8095 100644 --- a/indra/newview/skins/default/xui/fr/floater_fs_poser.xml +++ b/indra/newview/skins/default/xui/fr/floater_fs_poser.xml @@ -214,6 +214,7 @@ + @@ -226,7 +227,7 @@