Skip to content

Commit 14f2170

Browse files
authored
Merge pull request #33 from unoplatform/dev/jela/sign2
chore: Move to uno, adjust signing base
2 parents c188102 + 48c105f commit 14f2170

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: CI
33
on:
44
push:
55
branches:
6-
- uno
6+
- main
77
- release/*/*
88
pull_request:
99
branches:
10-
- uno
10+
- main
1111
- release/*/*
1212
workflow_dispatch:
1313

@@ -89,7 +89,7 @@ jobs:
8989
name: Sign
9090
runs-on: windows-latest
9191
needs: build
92-
if: github.event_name == 'push' && (github.ref == 'refs/heads/uno' || startsWith(github.ref, 'refs/heads/release/'))
92+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/'))
9393
environment: PackageSign
9494
permissions:
9595
contents: read
@@ -104,6 +104,12 @@ jobs:
104104
name: NuGet
105105
path: ${{ env.ARTIFACTS_DIR }}
106106

107+
- name: Export relative artifacts path
108+
shell: pwsh
109+
run: |
110+
$relativePath = [System.IO.Path]::GetRelativePath((Get-Location), "${{ env.ARTIFACTS_DIR }}")
111+
"ARTIFACTS_DIR_REL=$relativePath" | Out-File -FilePath $env:GITHUB_ENV -Append
112+
107113
- name: Setup .NET
108114
uses: actions/setup-dotnet@v4
109115

@@ -121,10 +127,9 @@ jobs:
121127
- name: Sign artifacts
122128
shell: pwsh
123129
run: >-
124-
./sign code azure-key-vault ${{ env.ARTIFACTS_DIR }}/**/*.nupkg --publisher-name "uno.monaco-editor-uwp"
130+
./sign code azure-key-vault "${{ env.ARTIFACTS_DIR_REL }}/**/*.nupkg" --publisher-name "uno.monaco.editor"
125131
--description "Uno Monaco Editor UWP"
126132
--description-url "https://github.com/${{ github.repository }}"
127-
--azure-key-vault-managed-identity true
128133
--azure-key-vault-url "${{ secrets.SIGN_KEY_VAULT_URL }}"
129134
--azure-key-vault-certificate "${{ secrets.SIGN_KEY_VAULT_CERTIFICATE_ID }}"
130135
--verbosity information
@@ -140,7 +145,7 @@ jobs:
140145
runs-on: ubuntu-latest
141146
environment: Development
142147
needs: sign
143-
if: github.event_name == 'push' && github.ref == 'refs/heads/uno'
148+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
144149
steps:
145150
- name: Checkout
146151
uses: actions/checkout@v4

MonacoEditorComponent/MonacoEditorComponent.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<Authors>Uno Platform</Authors>
1616
<Copyright>Copyright (C) 2015-$([System.DateTime]::UtcNow.Year) Uno Platform inc. - all rights reserved</Copyright>
1717
<PackageLicenseExpression>MIT</PackageLicenseExpression>
18-
<RepositoryUrl>https://github.com/unoplatform/uno.monaco-editor-uwp</RepositoryUrl>
19-
<PackageProjectUrl>https://github.com/unoplatform/uno.monaco-editor-uwp</PackageProjectUrl>
18+
<RepositoryUrl>https://github.com/unoplatform/uno.monaco.editor</RepositoryUrl>
19+
<PackageProjectUrl>https://github.com/unoplatform/uno.monaco.editor</PackageProjectUrl>
2020
<PackageTags>wasm monaco editor controls</PackageTags>
2121
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)