Merge branch 'main' into chore/limit_versions

open-component-model · Nov 25, 2024 · 301c3e0 · 301c3e0
2 parents c9af3b7 + a6bbc23
commit 301c3e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/.github/workflows/publish-to-other-than-github.yaml b/.github/workflows/publish-to-other-than-github.yaml
@@ -130,24 +130,11 @@ jobs:
       run: |
         $version = "${{ github.event.client_payload.version }}" -replace 'v'
         echo "RELEASE_VERSION=$version" | Out-File $env:GITHUB_ENV
-    - name: Generate token
-      id: generate_token
-      uses: tibdex/github-app-token@v2
-      with:
-        app_id: ${{ secrets.OCMBOT_APP_ID }}
-        private_key: ${{ secrets.OCMBOT_PRIV_KEY }}
-        permissions: |
-          {"contents":"write","pull_requests":"write"}
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        token: ${{ steps.generate_token.outputs.token }}
     - name: Install wingetcreate
-      run: choco install wingetcreate
+      run: iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
     - name: Update Winget package
       run: |
-        cd hack\winget
-        wingetcreate update --submit --token ${{ steps.generate_token.outputs.token }} --urls `
+        .\wingetcreate.exe update --submit --token ${{ secrets.OCM_CI_ROBOT_0_REPO }} --urls `
           https://github.com/open-component-model/ocm/releases/download/v${{ env.RELEASE_VERSION }}/ocm-${{ env.RELEASE_VERSION }}-windows-amd64.zip `
           https://github.com/open-component-model/ocm/releases/download/v${{ env.RELEASE_VERSION }}/ocm-${{ env.RELEASE_VERSION }}-windows-arm64.zip `
           --version ${{ env.RELEASE_VERSION }} `

diff --git a/api/tech/signing/handlers/sigstore/attr/attr.go b/api/tech/signing/handlers/sigstore/attr/attr.go
@@ -15,7 +15,7 @@ const (
 
 var defaultAttr = Attribute{
 	// https://github.com/tektoncd/chains/blob/main/docs/config.md#keyless-signing-with-fulcio
-	FulcioURL:    "https://v1.fulcio.sigstore.dev",
+	FulcioURL:    "https://fulcio.sigstore.dev",
 	RekorURL:     "https://rekor.sigstore.dev",
 	OIDCIssuer:   "https://oauth2.sigstore.dev/auth",
 	OIDCClientID: "sigstore",
@@ -46,7 +46,7 @@ func (a AttributeType) Description() string {
 	return `
 *sigstore config* Configuration to use for sigstore based signing.
 The following fields are used.
-- *<code>fulcioURL</code>* *string*  default is https://v1.fulcio.sigstore.dev
+- *<code>fulcioURL</code>* *string*  default is https://fulcio.sigstore.dev
 - *<code>rekorURL</code>* *string*  default is https://rekor.sigstore.dev
 - *<code>OIDCIssuer</code>* *string*  default is https://oauth2.sigstore.dev/auth
 - *<code>OIDCClientID</code>* *string*  default is sigstore

diff --git a/docs/reference/ocm.md b/docs/reference/ocm.md
@@ -309,7 +309,7 @@ The value can be a simple type or a JSON/YAML string for complex values
 - <code>ocm.software/signing/sigstore</code> [<code>sigstore</code>]: *sigstore config* Configuration to use for sigstore based signing.
 
   The following fields are used.
-  - *<code>fulcioURL</code>* *string*  default is https://v1.fulcio.sigstore.dev
+  - *<code>fulcioURL</code>* *string*  default is https://fulcio.sigstore.dev
   - *<code>rekorURL</code>* *string*  default is https://rekor.sigstore.dev
   - *<code>OIDCIssuer</code>* *string*  default is https://oauth2.sigstore.dev/auth
   - *<code>OIDCClientID</code>* *string*  default is sigstore

diff --git a/docs/reference/ocm_attributes.md b/docs/reference/ocm_attributes.md
@@ -201,7 +201,7 @@ OCM library:
 - <code>ocm.software/signing/sigstore</code> [<code>sigstore</code>]: *sigstore config* Configuration to use for sigstore based signing.
 
   The following fields are used.
-  - *<code>fulcioURL</code>* *string*  default is https://v1.fulcio.sigstore.dev
+  - *<code>fulcioURL</code>* *string*  default is https://fulcio.sigstore.dev
   - *<code>rekorURL</code>* *string*  default is https://rekor.sigstore.dev
   - *<code>OIDCIssuer</code>* *string*  default is https://oauth2.sigstore.dev/auth
   - *<code>OIDCClientID</code>* *string*  default is sigstore